diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2014-02-09 01:54:16 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-02-15 12:06:29 (GMT) |
| commit | b4a7752963cdb1ea4e5f38519f705ed0e6e448f0 (patch) | |
| tree | b8f9608f5b8ac1fb4503d2bde22dcd82e8515b66 /src/apr-1.patch | |
| parent | c1af6d7ab9b7f4d7f0181694377d1df3c773978b (diff) | |
| download | mxe-b4a7752963cdb1ea4e5f38519f705ed0e6e448f0.zip mxe-b4a7752963cdb1ea4e5f38519f705ed0e6e448f0.tar.gz mxe-b4a7752963cdb1ea4e5f38519f705ed0e6e448f0.tar.bz2 | |
package apr: fix winsock2.h/window.h include order, enforced by MinGW 4
Diffstat (limited to 'src/apr-1.patch')
| -rw-r--r-- | src/apr-1.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/apr-1.patch b/src/apr-1.patch new file mode 100644 index 0000000..6c8d850 --- /dev/null +++ b/src/apr-1.patch @@ -0,0 +1,33 @@ +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 + +MinGW 4 is particular about this. + +diff --git a/include/apr.h.in b/include/apr.h.in +index 9f1fb6f..f1741c1 100644 +--- a/include/apr.h.in ++++ b/include/apr.h.in +@@ -115,14 +115,14 @@ + * or the extern "C" namespace + */ + +-#if APR_HAVE_WINDOWS_H +-#include <windows.h> +-#endif +- + #if APR_HAVE_WINSOCK2_H + #include <winsock2.h> + #endif + ++#if APR_HAVE_WINDOWS_H ++#include <windows.h> ++#endif ++ + #if APR_HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif +-- +1.8.4.5 + |