eliot/extras/contrib/apr-bugzilla-56342.patch
Olivier Teulière 0a1a46942e Update contribs for Windows
This brings various improvements in the Makefile as well.
Qt is currently broken though.
2018-11-10 16:49:47 +01:00

31 lines
783 B
Diff

# From https://bz.apache.org/bugzilla/show_bug.cgi?id=56342
--- include/arch/win32/apr_private.h.orig 2014-07-03 14:34:47 -0500
+++ 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
--- file_io/win32/filestat.c.orig 2014-07-03 14:42:41 -0500
+++ 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"