parent
595cf68a00
commit
394d23ad0e
@ -0,0 +1,42 @@
|
|||||||
|
This file is part of MXE. See LICENSE.md for licensing information.
|
||||||
|
|
||||||
|
Contains ad hoc patches for cross building.
|
||||||
|
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Boris Nagaev <bnagaev@gmail.com>
|
||||||
|
Date: Sun, 30 Aug 2015 14:26:24 +0200
|
||||||
|
Subject: [PATCH 1/2] include stdio.h
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/CPP/7zip/Common/FileStreams.cpp b/CPP/7zip/Common/FileStreams.cpp
|
||||||
|
index 1111111..2222222 100644
|
||||||
|
--- a/CPP/7zip/Common/FileStreams.cpp
|
||||||
|
+++ b/CPP/7zip/Common/FileStreams.cpp
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
// FileStreams.cpp
|
||||||
|
|
||||||
|
#include "StdAfx.h"
|
||||||
|
+#include <stdio.h>
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Boris Nagaev <bnagaev@gmail.com>
|
||||||
|
Date: Sun, 30 Aug 2015 14:46:10 +0200
|
||||||
|
Subject: [PATCH 2/2] MyString: include windows.h
|
||||||
|
|
||||||
|
Functions CharUpperA, CharPrev etc
|
||||||
|
|
||||||
|
diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h
|
||||||
|
index 1111111..2222222 100644
|
||||||
|
--- a/CPP/Common/MyString.h
|
||||||
|
+++ b/CPP/Common/MyString.h
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
#define __COMMON_STRING_H
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
+#include <windows.h>
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
#include <wctype.h>
|
@ -1,26 +0,0 @@
|
|||||||
This file is part of MXE. See LICENSE.md for licensing information.
|
|
||||||
|
|
||||||
From dd3c0c213571d2ff8acbb3b19966cfa4d6bff3cc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Boris Nagaev <bnagaev@gmail.com>
|
|
||||||
Date: Sun, 30 Aug 2015 14:26:24 +0200
|
|
||||||
Subject: [PATCH] include stdio.h
|
|
||||||
|
|
||||||
---
|
|
||||||
CPP/7zip/Common/FileStreams.cpp | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/CPP/7zip/Common/FileStreams.cpp b/CPP/7zip/Common/FileStreams.cpp
|
|
||||||
index de49911..7609c56 100755
|
|
||||||
--- a/CPP/7zip/Common/FileStreams.cpp
|
|
||||||
+++ b/CPP/7zip/Common/FileStreams.cpp
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
// FileStreams.cpp
|
|
||||||
|
|
||||||
#include "StdAfx.h"
|
|
||||||
+#include <stdio.h>
|
|
||||||
|
|
||||||
#ifndef _WIN32
|
|
||||||
#include <fcntl.h>
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
|||||||
This file is part of MXE. See LICENSE.md for licensing information.
|
|
||||||
|
|
||||||
From 7798a70fa69dc4994cc25f82ec3e9b2b368d50fe Mon Sep 17 00:00:00 2001
|
|
||||||
From: Boris Nagaev <bnagaev@gmail.com>
|
|
||||||
Date: Sun, 30 Aug 2015 14:46:10 +0200
|
|
||||||
Subject: [PATCH] MyString: include windows.h
|
|
||||||
|
|
||||||
Functions CharUpperA, CharPrev etc
|
|
||||||
---
|
|
||||||
CPP/Common/MyString.h | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h
|
|
||||||
index 7db8a37..297986f 100755
|
|
||||||
--- a/CPP/Common/MyString.h
|
|
||||||
+++ b/CPP/Common/MyString.h
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
#define __COMMON_STRING_H
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
+#include <windows.h>
|
|
||||||
|
|
||||||
#include "MyVector.h"
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
Loading…
Reference in new issue