55 lines
1.4 KiB
Diff
55 lines
1.4 KiB
Diff
--- freerdp-git/winpr/include/winpr/nt.h.orig 2015-07-19 10:16:50.940895800 +0300
|
|
+++ freerdp-git/winpr/include/winpr/nt.h 2015-07-19 10:25:19.643991900 +0300
|
|
@@ -1286,12 +1286,15 @@
|
|
|
|
#include <winternl.h>
|
|
|
|
+#ifndef __MINGW64_VERSION_MAJOR
|
|
#undef FILE_INFORMATION_CLASS
|
|
#undef _FILE_INFORMATION_CLASS
|
|
#undef FileDirectoryInformation
|
|
+#endif
|
|
|
|
#endif
|
|
|
|
+#ifndef __MINGW64_VERSION_MAJOR
|
|
typedef enum _FILE_INFORMATION_CLASS
|
|
{
|
|
FileDirectoryInformation = 1,
|
|
@@ -1335,6 +1338,7 @@
|
|
FileValidDataLengthInformation,
|
|
FileShortNameInformation
|
|
} FILE_INFORMATION_CLASS;
|
|
+#endif
|
|
|
|
#ifndef _WIN32
|
|
|
|
--- freerdp-git/winpr/include/winpr/synch.h.orig 2015-07-19 10:21:55.124294100 +0300
|
|
+++ freerdp-git/winpr/include/winpr/synch.h 2015-07-19 10:29:13.460365500 +0300
|
|
@@ -285,7 +285,7 @@
|
|
#if (!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0600))
|
|
|
|
/* One-Time Initialization */
|
|
-
|
|
+#ifndef _RTL_RUN_ONCE_DEF
|
|
typedef struct _RTL_RUN_ONCE
|
|
{
|
|
PVOID Ptr;
|
|
@@ -293,6 +293,7 @@
|
|
|
|
#define RTL_RUN_ONCE_INIT { 0 }
|
|
#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT
|
|
+#endif
|
|
|
|
typedef RTL_RUN_ONCE INIT_ONCE;
|
|
typedef PRTL_RUN_ONCE PINIT_ONCE;
|
|
@@ -308,7 +309,7 @@
|
|
|
|
/* Synchronization Barrier */
|
|
|
|
-#if (!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0602))
|
|
+#if (!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0602) && !defined(__MINGW64_VERSION_MAJOR))
|
|
|
|
typedef struct _RTL_BARRIER
|
|
{
|