diff options
author | Alexey Neyman <stilor@att.net> | 2017-03-12 08:42:09 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-12 08:42:09 (GMT) |
commit | a3dd55b96409922a416c05ab053569ec4f91126b (patch) | |
tree | bb6fd804743caad8ad2c0a09025452891892b175 | |
parent | 8f4db915bdb7b17a636d5ba7678bdb9c6c634cc0 (diff) | |
parent | 0b566d687fdd2da48e5ec64f1edeb7570d02f1a3 (diff) |
Merge pull request #643 from stilor/macos-mingw-malloc.h
mingw-w64: no <malloc.h> on macos
-rw-r--r-- | config/libc/mingw.in | 35 | ||||
-rw-r--r-- | patches/mingw-w64/v2.0.7/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v2.0.8/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v2.0.9/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v3.0.0/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v3.1.0/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v3.2.0/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v3.3.0/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v4.0.0/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v4.0.1/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v4.0.2/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v4.0.4/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v4.0.6/100-mingw64-malloc.patch | 27 | ||||
-rw-r--r-- | patches/mingw-w64/v5.0.0/100-mingw64-malloc.patch | 55 | ||||
-rw-r--r-- | patches/mingw-w64/v5.0.1/100-mingw64-malloc.patch | 55 |
16 files changed, 494 insertions, 2 deletions
diff --git a/config/libc/mingw.in b/config/libc/mingw.in index 62e7a46..936fd67 100644 --- a/config/libc/mingw.in +++ b/config/libc/mingw.in @@ -28,9 +28,19 @@ config WINAPI_V_5_0_0 prompt "5.0.0 (OBSOLETE)" depends on OBSOLETE +config WINAPI_V_4_0_6 + bool + prompt "4.0.6" + +config WINAPI_V_4_0_5 + bool + prompt "4.0.5 (OBSOLETE)" + depends on OBSOLETE + config WINAPI_V_4_0_4 bool - prompt "4.0.4" + prompt "4.0.4 (OBSOLETE)" + depends on OBSOLETE config WINAPI_V_4_0_2 bool @@ -47,15 +57,31 @@ config WINAPI_V_4_0_0 prompt "4.0.0 (OBSOLETE)" depends on OBSOLETE +config WINAPI_V_3_3_0 + bool + prompt "3.3.0 (OBSOLETE)" + depends on OBSOLETE + +config WINAPI_V_3_2_0 + bool + prompt "3.2.0 (OBSOLETE)" + depends on OBSOLETE + config WINAPI_V_3_1_0 bool - prompt "3.1.0" + prompt "3.1.0 (OBSOLETE)" + depends on OBSOLETE config WINAPI_V_3_0_0 bool prompt "3.0.0 (OBSOLETE)" depends on OBSOLETE +config WINAPI_V_2_0_9 + bool + prompt "2.0.9 (OBSOLETE)" + depends on OBSOLETE + config WINAPI_V_2_0_8 bool prompt "2.0.8 (OBSOLETE)" @@ -86,12 +112,17 @@ config WINAPI_VERSION # CT_INSERT_VERSION_STRING_BELOW default "5.0.1" if WINAPI_V_5_0_1 default "5.0.0" if WINAPI_V_5_0_0 + default "4.0.6" if WINAPI_V_4_0_6 + default "4.0.5" if WINAPI_V_4_0_5 default "4.0.4" if WINAPI_V_4_0_4 default "4.0.2" if WINAPI_V_4_0_2 default "4.0.1" if WINAPI_V_4_0_1 default "4.0.0" if WINAPI_V_4_0_0 + default "3.3.0" if WINAPI_V_3_3_0 + default "3.2.0" if WINAPI_V_3_2_0 default "3.1.0" if WINAPI_V_3_1_0 default "3.0.0" if WINAPI_V_3_0_0 + default "2.0.9" if WINAPI_V_2_0_9 default "2.0.8" if WINAPI_V_2_0_8 default "2.0.7" if WINAPI_V_2_0_7 help diff --git a/patches/mingw-w64/v2.0.7/100-mingw64-malloc.patch b/patches/mingw-w64/v2.0.7/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v2.0.7/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v2.0.8/100-mingw64-malloc.patch b/patches/mingw-w64/v2.0.8/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v2.0.8/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v2.0.9/100-mingw64-malloc.patch b/patches/mingw-w64/v2.0.9/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v2.0.9/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v3.0.0/100-mingw64-malloc.patch b/patches/mingw-w64/v3.0.0/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v3.0.0/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v3.1.0/100-mingw64-malloc.patch b/patches/mingw-w64/v3.1.0/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v3.1.0/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v3.2.0/100-mingw64-malloc.patch b/patches/mingw-w64/v3.2.0/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v3.2.0/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v3.3.0/100-mingw64-malloc.patch b/patches/mingw-w64/v3.3.0/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v3.3.0/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v4.0.0/100-mingw64-malloc.patch b/patches/mingw-w64/v4.0.0/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v4.0.0/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v4.0.1/100-mingw64-malloc.patch b/patches/mingw-w64/v4.0.1/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v4.0.1/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v4.0.2/100-mingw64-malloc.patch b/patches/mingw-w64/v4.0.2/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v4.0.2/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v4.0.4/100-mingw64-malloc.patch b/patches/mingw-w64/v4.0.4/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v4.0.4/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch b/patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v4.0.6/100-mingw64-malloc.patch b/patches/mingw-w64/v4.0.6/100-mingw64-malloc.patch new file mode 100644 index 0000000..d9d5a61 --- /dev/null +++ b/patches/mingw-w64/v4.0.6/100-mingw64-malloc.patch @@ -0,0 +1,27 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + diff --git a/patches/mingw-w64/v5.0.0/100-mingw64-malloc.patch b/patches/mingw-w64/v5.0.0/100-mingw64-malloc.patch new file mode 100644 index 0000000..3d05b63 --- /dev/null +++ b/patches/mingw-w64/v5.0.0/100-mingw64-malloc.patch @@ -0,0 +1,55 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h 2017-03-10 16:26:21.000000000 -0800 +@@ -12,9 +12,8 @@ + #define PATHTOOLS_H + + #include <unistd.h> +-#if defined(__APPLE__) + #include <stdlib.h> +-#else ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> + #endif + #include <stdio.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c 2017-03-10 16:26:40.000000000 -0800 +@@ -8,9 +8,8 @@ + .email: <mingw.android@gmail.com>. + */ + +-#if defined(__APPLE__) + #include <stdlib.h> +-#else ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> + #endif + #include <limits.h> diff --git a/patches/mingw-w64/v5.0.1/100-mingw64-malloc.patch b/patches/mingw-w64/v5.0.1/100-mingw64-malloc.patch new file mode 100644 index 0000000..3d05b63 --- /dev/null +++ b/patches/mingw-w64/v5.0.1/100-mingw64-malloc.patch @@ -0,0 +1,55 @@ +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800 +@@ -26,7 +26,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif + #include <memory.h> + #include <stdarg.h> + #include <stdint.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800 +@@ -21,7 +21,10 @@ + #include "genidl_cfg.h" + #include "genidl_typeinfo.h" + #include "genidl_typinfo.h" ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> ++#endif ++#include <stdlib.h> + #include <string.h> + #include <memory.h> + +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h 2017-03-10 16:26:21.000000000 -0800 +@@ -12,9 +12,8 @@ + #define PATHTOOLS_H + + #include <unistd.h> +-#if defined(__APPLE__) + #include <stdlib.h> +-#else ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> + #endif + #include <stdio.h> +diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c +--- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c 2017-03-10 16:20:09.000000000 -0800 ++++ mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c 2017-03-10 16:26:40.000000000 -0800 +@@ -8,9 +8,8 @@ + .email: <mingw.android@gmail.com>. + */ + +-#if defined(__APPLE__) + #include <stdlib.h> +-#else ++#if defined(HAVE_MALLOC_H) + #include <malloc.h> + #endif + #include <limits.h> |