Author: tkreuzer
Date: Thu Mar 11 01:47:36 2010
New Revision: 46089
URL:
http://svn.reactos.org/svn/reactos?rev=46089&view=rev
Log:
[KMTYPES]
Add a compilation hack for gcc
Modified:
branches/header-work/include/psdk/ktmtypes.h
Modified: branches/header-work/include/psdk/ktmtypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ktmtyp…
==============================================================================
--- branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] Thu Mar 11 01:47:36 2010
@@ -72,7 +72,11 @@
#define MAX_TRANSACTION_DESCRIPTION_LENGTH 64
#define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH 64
+/* HACK: GCC does not like class members of the same name */
+#ifdef _MSC_VER
typedef GUID UOW, *PUOW;
+#endif
+
typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID;
typedef ULONG NOTIFICATION_MASK;
typedef ULONG SAVEPOINT_ID, *PSAVEPOINT_ID;
@@ -86,7 +90,7 @@
typedef struct _TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT {
GUID EnlistmentId;
- UOW UOW;
+ GUID UOW;
} TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT,
*PTRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT;
typedef struct _TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT {
@@ -119,7 +123,7 @@
} KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER;
typedef struct _KCRM_TRANSACTION_BLOB {
- UOW UOW;
+ GUID UOW;
GUID TmIdentity;
ULONG IsolationLevel;
ULONG IsolationFlags;