diff options
author | Alexey Neyman <stilor@att.net> | 2017-06-05 07:30:35 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-05 07:30:35 (GMT) |
commit | 02f21e8bf37deaab1a836f4afd11c5fc8ee30220 (patch) | |
tree | 14f8612734a1b2e44e50afc90e9a7651d2339cd5 /patches/mingw-w64/v5.0.2/100-mingw64-malloc.patch | |
parent | ed1d2d6a0e826b172454bae988de79945a67fe24 (diff) | |
parent | 6aaa2a1a67d2f105bac21750b02142201052393f (diff) |
Merge pull request #734 from stilor/upgrades
Upgrades (a bunch of)
Diffstat (limited to 'patches/mingw-w64/v5.0.2/100-mingw64-malloc.patch')
-rw-r--r-- | patches/mingw-w64/v5.0.2/100-mingw64-malloc.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/patches/mingw-w64/v5.0.2/100-mingw64-malloc.patch b/patches/mingw-w64/v5.0.2/100-mingw64-malloc.patch new file mode 100644 index 0000000..3d05b63 --- /dev/null +++ b/patches/mingw-w64/v5.0.2/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> |