blob: ea63c9bf6f81f924a3d61ee023878698c94187ac (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
This file is part of MXE. See LICENSE.md for licensing information.
From: "Jon Schewe (BBN) <jschewe@bbn.com>"
Taken from https://issues.apache.org/bugzilla/attachment.cgi?id=31800.
--- a/include/arch/win32/apr_private.h.orig 2014-07-03 14:34:47 -0500
+++ b/include/arch/win32/apr_private.h 2014-07-03 14:35:51 -0500
@@ -45,13 +45,9 @@
*/
#ifndef _WIN32_WCE
#define HAVE_ACLAPI 1
-#ifdef __wtypes_h__
+#define COM_NO_WINDOWS_H
#include <accctrl.h>
-#else
-#define __wtypes_h__
-#include <accctrl.h>
-#undef __wtypes_h__
-#endif
+#undef COM_NO_WINDOWS_H
#else
#define HAVE_ACLAPI 0
#endif
--- a/file_io/win32/filestat.c.orig 2014-07-03 14:42:41 -0500
+++ b/file_io/win32/filestat.c 2014-07-03 14:43:09 -0500
@@ -15,7 +15,9 @@
*/
#include "apr.h"
+#define COM_NO_WINDOWS_H
#include <aclapi.h>
+#undef COM_NO_WINDOWS_H
#include "apr_private.h"
#include "apr_arch_file_io.h"
#include "apr_file_io.h"
|
