Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-27 13:49:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK]

Browse source 
- remove GCC special flag, as it has no reason to exist. Thanks go to Timo for having tested this.

svn path=/branches/cmake-bringup/; revision=49297
This commit is contained in:
Jérôme Gardou 2010-10-26 21:57:12 +00:00
parent 252350f815
commit 5bc7ffddc4
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/psdk/rpcndr.h
View file

@ -204,7 +204,7 @@ typedef struct _MIDL_STUB_MESSAGE
ULONG_PTR MaxCount; ULONG_PTR MaxCount;
ULONG Offset; ULONG Offset;
ULONG ActualCount; ULONG ActualCount;
void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t);
void (__RPC_API *pfnFree)(void *); void (__RPC_API *pfnFree)(void *);
unsigned char *StackTop; unsigned char *StackTop;
unsigned char *pPresentedType; unsigned char *pPresentedType;
@ -486,7 +486,7 @@ typedef struct _NDR_USER_MARSHAL_INFO_LEVEL1
{ {
void *Buffer; void *Buffer;
ULONG BufferSize; ULONG BufferSize;
void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(SIZE_T); void * (__WINE_ALLOC_SIZE(1) __RPC_API *pfnAllocate)(size_t);
void (__RPC_API *pfnFree)(void *); void (__RPC_API *pfnFree)(void *);
struct IRpcChannelBuffer *pRpcChannelBuffer; struct IRpcChannelBuffer *pRpcChannelBuffer;
ULONG_PTR Reserved[5]; ULONG_PTR Reserved[5];
@ -652,24 +652,14 @@ RPCRTAPI void RPC_ENTRY
RPCRTAPI unsigned char* RPC_ENTRY RPCRTAPI unsigned char* RPC_ENTRY
NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar ); NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar );
#ifdef __GCC__ CLIENT_CALL_RETURN RPC_VAR_ENTRY
/* Note: this should return a CLIENT_CALL_RETURN, but calling convention for
* returning structures/unions is different between Windows and gcc on i386. */
LONG_PTR RPC_VAR_ENTRY
NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... );
LONG_PTR RPC_VAR_ENTRY CLIENT_CALL_RETURN RPC_VAR_ENTRY
NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... );
LONG_PTR RPC_VAR_ENTRY CLIENT_CALL_RETURN RPC_VAR_ENTRY
NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... );
LONG_PTR RPC_VAR_ENTRY CLIENT_CALL_RETURN RPC_VAR_ENTRY
NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... );
#else
CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2(
PMIDL_STUB_DESC pStubDescriptor,
PFORMAT_STRING pFormat,
...
);
#endif
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
NdrServerCall2( PRPC_MESSAGE pRpcMsg ); NdrServerCall2( PRPC_MESSAGE pRpcMsg );