Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KTMTYPES]

Browse source 
Fix the UOW hack, use special case for C++
Thanks to Dmitry Gorbachev for the solution.

svn path=/branches/header-work/; revision=46094
This commit is contained in:
Timo Kreuzer 2010-03-11 11:32:54 +00:00
parent 1f40221394
commit 7494f42e77
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/psdk/ktmtypes.h
View file

@ -72,11 +72,7 @@
#define MAX_TRANSACTION_DESCRIPTION_LENGTH 64 #define MAX_TRANSACTION_DESCRIPTION_LENGTH 64
#define MAX_RESOURCEMANAGER_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; typedef GUID UOW, *PUOW;
#endif
typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID; typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID;
typedef ULONG NOTIFICATION_MASK; typedef ULONG NOTIFICATION_MASK;
typedef ULONG SAVEPOINT_ID, *PSAVEPOINT_ID; typedef ULONG SAVEPOINT_ID, *PSAVEPOINT_ID;
@ -90,7 +86,11 @@ typedef struct _TRANSACTION_NOTIFICATION {
typedef struct _TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT { typedef struct _TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT {
GUID EnlistmentId; GUID EnlistmentId;
GUID UOW; #if defined(__cplusplus)
::UOW UOW;
#else
UOW UOW;
#endif
} TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT, *PTRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT; } TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT, *PTRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT;
typedef struct _TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT { typedef struct _TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT {
@ -123,7 +123,11 @@ typedef struct _KCRM_MARSHAL_HEADER {
} KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER; } KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER;
typedef struct _KCRM_TRANSACTION_BLOB { typedef struct _KCRM_TRANSACTION_BLOB {
GUID UOW; #if defined(__cplusplus)
::UOW UOW;
#else
UOW UOW;
#endif
GUID TmIdentity; GUID TmIdentity;
ULONG IsolationLevel; ULONG IsolationLevel;
ULONG IsolationFlags; ULONG IsolationFlags;