[ros-diffs] [tkreuzer] 46094: [KTMTYPES] Fix the UOW hack, use special case for C++ Thanks to Dmitry Gorbachev for the solution.

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Thu Mar 11 12:32:54 CET 2010


Author: tkreuzer
Date: Thu Mar 11 12:32:54 2010
New Revision: 46094

URL: http://svn.reactos.org/svn/reactos?rev=46094&view=rev
Log:
[KTMTYPES]
Fix the UOW hack, use special case for C++
Thanks to Dmitry Gorbachev for the solution.

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/ktmtypes.h?rev=46094&r1=46093&r2=46094&view=diff
==============================================================================
--- branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] Thu Mar 11 12:32:54 2010
@@ -72,11 +72,7 @@
 #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;
@@ -90,7 +86,11 @@
 
 typedef struct _TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT {
   GUID EnlistmentId;
-  GUID UOW;
+#if defined(__cplusplus)
+  ::UOW UOW;
+#else
+  UOW UOW;
+#endif
 } TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT, *PTRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT;
 
 typedef struct _TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT {
@@ -123,7 +123,11 @@
 } KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER;
 
 typedef struct _KCRM_TRANSACTION_BLOB {
-  GUID UOW;
+#if defined(__cplusplus)
+  ::UOW UOW;
+#else
+  UOW UOW;
+#endif
   GUID TmIdentity;
   ULONG IsolationLevel;
   ULONG IsolationFlags;




More information about the Ros-diffs mailing list