[ros-diffs] [jgardou] 49297: [PSDK] - remove GCC special flag, as it has no reason to exist. Thanks go to Timo for having tested this.

Author: jgardou
Date: Tue Oct 26 21:57:12 2010
New Revision: 49297

URL: http://svn.reactos.org/svn/reactos?rev=49297&view=rev
Log:
[PSDK]
  - remove GCC special flag, as it has no reason to exist. Thanks go to Timo for having tested this.

Modified:
    branches/cmake-bringup/include/psdk/rpcndr.h

Modified: branches/cmake-bringup/include/psdk/rpcndr.h
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcnd...
==============================================================================
--- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Oct 26 21:57:12 2010
@@ -204,7 +204,7 @@
   ULONG_PTR MaxCount;
   ULONG Offset;
   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 *);
   unsigned char *StackTop;
   unsigned char *pPresentedType;
@@ -486,7 +486,7 @@
 {
     void *Buffer;
     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 *);
     struct IRpcChannelBuffer *pRpcChannelBuffer;
     ULONG_PTR Reserved[5];
@@ -652,24 +652,14 @@
 RPCRTAPI unsigned char* RPC_ENTRY
   NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar );

-#ifdef __GCC__
-/* 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
+CLIENT_CALL_RETURN RPC_VAR_ENTRY
   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, ... );
-LONG_PTR RPC_VAR_ENTRY
+CLIENT_CALL_RETURN RPC_VAR_ENTRY
   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, ... );
-#else
-CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2(
-  PMIDL_STUB_DESC pStubDescriptor,
-  PFORMAT_STRING pFormat,
-  ...
-);
-#endif

RPCRTAPI void RPC_ENTRY
   NdrServerCall2( PRPC_MESSAGE pRpcMsg );