[ros-diffs] [jgardou] 57905: [OLE32] - Fix compilation with newer GCC

Author: jgardou
Date: Thu Dec 13 16:00:44 2012
New Revision: 57905

URL: http://svn.reactos.org/svn/reactos?rev=57905&view=rev
Log:
[OLE32]
 - Fix compilation with newer GCC

Modified:
    trunk/reactos/dll/win32/ole32/stg_prop.c

Modified: trunk/reactos/dll/win32/ole32/stg_prop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c?...
==============================================================================
--- trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] Thu Dec 13 16:00:44 2012
@@ -1035,12 +1035,12 @@
 }

#ifdef __i386__
-#define __thiscall __stdcall
+#define __thiscall_wrapper __stdcall
 #else
-#define __thiscall __cdecl
+#define __thiscall_wrapper __cdecl
 #endif

-static void* __thiscall Allocate_CoTaskMemAlloc(void *userdata, ULONG size)
+static void* __thiscall_wrapper Allocate_CoTaskMemAlloc(void *userdata, ULONG size)
 {
     return CoTaskMemAlloc(size);
 }
@@ -1049,7 +1049,7 @@
  * end of the buffer.
  */
 static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data,
-    UINT codepage, void* (__thiscall *allocate)(void *userdata, ULONG size), void *allocate_data)
+    UINT codepage, void* (__thiscall_wrapper *allocate)(void *userdata, ULONG size), void *allocate_data)
 {
     HRESULT hr = S_OK;

@@ -2738,13 +2738,13 @@
                    "jmp *(4*(" #num "))(%eax)" )

DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8)
-extern void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize);
+extern void* __stdcall Allocate_PMemoryAllocator(void *this, ULONG cbSize);

#else

-static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize)
-{
-    void* (__thiscall *fn)(void*,ULONG) = **(void***)this;
+static void* __cdecl Allocate_PMemoryAllocator(void *this, ULONG cbSize)
+{
+    void* (__cdecl *fn)(void*,ULONG) = **(void***)this;
     return fn(this, cbSize);
 }