[OLE32]

 - Fix compilation with newer GCC

svn path=/trunk/; revision=57905

diff --git a/reactos/dll/win32/ole32/stg_prop.c b/reactos/dll/win32/ole32/stg_prop.c
index 915ecff..89f8379 100644 (file)
--- a/reactos/dll/win32/ole32/stg_prop.c
+++ b/reactos/dll/win32/ole32/stg_prop.c
@@ -1035,12 +1035,12 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This,
 }
 
 #ifdef __i386__
 }
 
 #ifdef __i386__

-#define __thiscall __stdcall
+#define __thiscall_wrapper __stdcall

 #else
 #else

-#define __thiscall __cdecl
+#define __thiscall_wrapper __cdecl

 #endif
 
 #endif
 

-static void* __thiscall Allocate_CoTaskMemAlloc(void *userdata, ULONG size)
+static void* __thiscall_wrapper Allocate_CoTaskMemAlloc(void *userdata, ULONG size)

 {
     return CoTaskMemAlloc(size);
 }
 {
     return CoTaskMemAlloc(size);
 }


@@ -1049,7 +1049,7 @@ static void* __thiscall Allocate_CoTaskMemAlloc(void *userdata, ULONG size)
  * end of the buffer.
  */
 static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data,
  * 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;
 
 {
     HRESULT hr = S_OK;
 


@@ -2738,13 +2738,13 @@ end:
                    "jmp *(4*(" #num "))(%eax)" )
 
 DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8)
                    "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
 
 
 #else
 

-static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize)
+static void* __cdecl Allocate_PMemoryAllocator(void *this, ULONG cbSize)

 {
 {

-    void* (__thiscall *fn)(void*,ULONG) = **(void***)this;
+    void* (__cdecl *fn)(void*,ULONG) = **(void***)this;

     return fn(this, cbSize);
 }
 
     return fn(this, cbSize);
 }