diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-11-13 06:21:30 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-11-13 06:21:47 (GMT) |
| commit | 2dd882c605f1f8ae1b4785a1929919ad212894fa (patch) | |
| tree | 8ecd6e724f523f4b81ba76d026b3d7a4ad4e9120 /src/apr-1.patch | |
| parent | 41592edbd049c8500425ae5fdefadea0df2677be (diff) | |
| download | mxe-2dd882c605f1f8ae1b4785a1929919ad212894fa.zip mxe-2dd882c605f1f8ae1b4785a1929919ad212894fa.tar.gz mxe-2dd882c605f1f8ae1b4785a1929919ad212894fa.tar.bz2 | |
apr[-util]: Update
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'src/apr-1.patch')
| -rw-r--r-- | src/apr-1.patch | 82 |
1 files changed, 62 insertions, 20 deletions
diff --git a/src/apr-1.patch b/src/apr-1.patch index de94bb2..530b5da 100644 --- a/src/apr-1.patch +++ b/src/apr-1.patch @@ -1,36 +1,78 @@ This file is part of MXE. See index.html for further information. -From d221ed3c7576a3456a8f5623246b46d355a4db83 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 9 Feb 2014 02:48:38 +0100 -Subject: [PATCH] winsock2.h must precede windows.h +From 1e244993f497ca7167361dfb29a2fe43232a7661 Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Thu, 13 Nov 2014 00:17:19 -0500 +Subject: [PATCH] Include windows.h after winsock2.h -MinGW 4 is particular about this. +Signed-off-by: Timothy Gu <timothygu99@gmail.com> +--- + include/apr.h.in | 2 +- + include/apr.hw | 2 +- + include/apr.hwc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/apr.h.in b/include/apr.h.in -index 9f1fb6f..f1741c1 100644 +index 0ad7a91..0d70142 100644 --- a/include/apr.h.in +++ b/include/apr.h.in -@@ -115,14 +115,14 @@ - * or the extern "C" namespace - */ +@@ -142,7 +142,6 @@ + #define NOIME + #endif --#if APR_HAVE_WINDOWS_H -#include <windows.h> --#endif -- - #if APR_HAVE_WINSOCK2_H - #include <winsock2.h> + /* + * Add a _very_few_ declarations missing from the restricted set of headers + * (If this list becomes extensive, re-enable the required headers above!) +@@ -156,6 +155,7 @@ + #else + #include <winsock.h> #endif ++#include <windows.h> -+#if APR_HAVE_WINDOWS_H + #endif /* ndef _WINDOWS_ */ + #endif /* APR_HAVE_WINDOWS_H */ +diff --git a/include/apr.hw b/include/apr.hw +index a75bc60..caa933c 100644 +--- a/include/apr.hw ++++ b/include/apr.hw +@@ -95,7 +95,6 @@ + #ifndef NOIME + #define NOIME + #endif +-#include <windows.h> + /* + * Add a _very_few_ declarations missing from the restricted set of headers + * (If this list becomes extensive, re-enable the required headers above!) +@@ -109,6 +108,7 @@ + #else + #include <winsock.h> + #endif +#include <windows.h> -+#endif -+ - #if APR_HAVE_SYS_TYPES_H - #include <sys/types.h> + #endif /* !_WINDOWS_ */ + + /** +diff --git a/include/apr.hwc b/include/apr.hwc +index 0579962..b171d48 100644 +--- a/include/apr.hwc ++++ b/include/apr.hwc +@@ -92,7 +92,6 @@ + #ifndef NOIME + #define NOIME + #endif +-#include <windows.h> + /* + * Add a _very_few_ declarations missing from the restricted set of headers + * (If this list becomes extensive, re-enable the required headers above!) +@@ -106,6 +105,7 @@ + #else + #include <winsock.h> #endif ++#include <windows.h> + #endif /* !_WINDOWS_ */ + + /** -- -1.8.4.5 +1.9.1 |