mingw32-headers/mingw-w64-headers-1.0b.20100818-uow.patch

81 lines
1.9 KiB
Diff
Raw Normal View History

--- mingw-w64-headers-1.0b.20100818/ddk/include/ddk/wdm.h 2010-08-16 22:18:25.000000000 +0200
+++ mingw-w64-headers-1.0b.20100818/ddk/include/ddk/wdm.h 2010-09-06 09:06:31.000000000 +0200
@@ -56,7 +56,11 @@
#endif /* _MAC */
#ifndef _KTMTYPES_
+#ifdef _MSC_VER
typedef GUID UOW, *PUOW;
+#else
+typedef GUID *PUOW;
+#endif
#endif
typedef GUID *PGUID;
@@ -14960,10 +14964,10 @@
} ENLISTMENT_INFORMATION_CLASS;
typedef struct _TRANSACTION_LIST_ENTRY {
-#if defined(__cplusplus)
- ::UOW UOW;
-#else
+#ifdef _MSC_VER
UOW UOW;
+#else
+ GUID UOW;
#endif
} TRANSACTION_LIST_ENTRY, *PTRANSACTION_LIST_ENTRY;
--- mingw-w64-headers-1.0b.20100818/include/ktmtypes.h 2010-08-17 10:51:42.000000000 +0200
+++ mingw-w64-headers-1.0b.20100818/include/ktmtypes.h 2010-09-06 09:06:31.000000000 +0200
@@ -92,7 +92,11 @@
#define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH 64
#ifndef _WDMDDK_
+#ifdef _MSC_VER
typedef GUID UOW, *PUOW;
+#else
+typedef GUID *PUOW;
+#endif
#endif
typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID;
@@ -126,7 +130,11 @@
typedef struct _TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT {
ULONG PropagationCookie;
+#ifdef _MSC_VER
+ UOW UOW;
+#else
GUID UOW;
+#endif
GUID TmIdentity;
ULONG BufferLength;
} TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT, *PTRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT,
@@ -134,7 +142,11 @@
typedef struct _TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT {
ULONG MarshalCookie;
+#ifdef _MSC_VER
+ UOW UOW;
+#else
GUID UOW;
+#endif
} TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT, *PTRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT;
typedef struct _KCRM_MARSHAL_HEADER {
@@ -145,10 +157,10 @@
} KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER;
typedef struct _KCRM_TRANSACTION_BLOB {
-#if defined(__cplusplus)
- ::UOW UOW;
-#else
+#ifdef _MSC_VER
UOW UOW;
+#else
+ GUID UOW;
#endif
GUID TmIdentity;
ULONG IsolationLevel;