From b4a7752963cdb1ea4e5f38519f705ed0e6e448f0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 9 Feb 2014 02:54:16 +0100 Subject: [PATCH] package apr: fix winsock2.h/window.h include order, enforced by MinGW 4 --- src/apr-1.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/apr-1.patch diff --git a/src/apr-1.patch b/src/apr-1.patch new file mode 100644 index 00000000..6c8d8506 --- /dev/null +++ b/src/apr-1.patch @@ -0,0 +1,33 @@ +From d221ed3c7576a3456a8f5623246b46d355a4db83 Mon Sep 17 00:00:00 2001 +From: Mark Brand +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 +-#endif +- + #if APR_HAVE_WINSOCK2_H + #include + #endif + ++#if APR_HAVE_WINDOWS_H ++#include ++#endif ++ + #if APR_HAVE_SYS_TYPES_H + #include + #endif +-- +1.8.4.5 +