summaryrefslogtreecommitdiff
path: root/patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-03-12 08:42:09 (GMT)
committerGitHub <noreply@github.com>2017-03-12 08:42:09 (GMT)
commita3dd55b96409922a416c05ab053569ec4f91126b (patch)
treebb6fd804743caad8ad2c0a09025452891892b175 /patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch
parent8f4db915bdb7b17a636d5ba7678bdb9c6c634cc0 (diff)
parent0b566d687fdd2da48e5ec64f1edeb7570d02f1a3 (diff)
Merge pull request #643 from stilor/macos-mingw-malloc.h
mingw-w64: no <malloc.h> on macos
Diffstat (limited to 'patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch')
-rw-r--r--patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch27
1 files changed, 27 insertions, 0 deletions
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>
+