From 1f402213944b05b89e6e7cc14443a0d3cfe7f51c Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 11 Mar 2010 00:47:36 +0000 Subject: [PATCH] [KMTYPES] Add a compilation hack for gcc svn path=/branches/header-work/; revision=46089 --- include/psdk/ktmtypes.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/psdk/ktmtypes.h b/include/psdk/ktmtypes.h index f498c0a1af6..b687a56e2a2 100644 --- a/include/psdk/ktmtypes.h +++ b/include/psdk/ktmtypes.h @@ -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 { 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 @@ typedef struct _KCRM_MARSHAL_HEADER { } 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; -- 2.17.1