diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 16:02:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 16:02:43 +0000 |
| commit | 20ca0b9cbe544428bf27847402c1645edd06f04d (patch) | |
| tree | f733df7245be209cbb16b95f5f0ee10788c6c7f5 | |
| parent | 65f6dfa344b5a7fd999500137d272efa634d6a78 (diff) | |
INTEGRATION: CWS mingwport13 (1.3.150); FILE MERGED
2008/05/05 11:46:25 vg 1.3.150.1: #i88772# MinGW fixes for DEV300
| -rw-r--r-- | sal/systools/win32/uwinapi/ResolveUnicows.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sal/systools/win32/uwinapi/ResolveUnicows.cpp b/sal/systools/win32/uwinapi/ResolveUnicows.cpp index 971fc07e4..f8bc72101 100644 --- a/sal/systools/win32/uwinapi/ResolveUnicows.cpp +++ b/sal/systools/win32/uwinapi/ResolveUnicows.cpp @@ -1,4 +1,5 @@ #ifdef __MINGW32__ +#define _GDI32_ #include "macros.h" #include <multimon.h> extern "C" { @@ -16,7 +17,7 @@ EXTERN_C void WINAPI ResolveThunk_UNICOWS( FARPROC *lppfn, LPCSTR lpLibFileName, } static void GetProcAddress_Thunk(); -EXTERN_C _declspec( dllexport ) FARPROC kernel32_GetProcAddress_Ptr = (FARPROC)GetProcAddress_Thunk; +EXTERN_C { _declspec( dllexport ) FARPROC kernel32_GetProcAddress_Ptr = (FARPROC)GetProcAddress_Thunk; } static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR); static void GetProcAddress_Thunk() { @@ -38,7 +39,7 @@ static FARPROC WINAPI GetProcAddress_Failure (HINSTANCE,LPCSTR) #define DEFINE_UNICOWS_THUNK( module, rettype, calltype, func, params ) \ static void func##_Thunk(); \ -EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ +EXTERN_C { _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; } \ static rettype calltype func##_##Failure params; \ static void func##_Thunk() \ { \ @@ -123,7 +124,7 @@ DEFINE_UNICOWS_THUNK( kernel32, HANDLE, WINAPI, CreateWaitableTimerW, (LPSECURIT DEFINE_UNICOWS_THUNK( user32, HWND, WINAPI, CreateWindowExW, (DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID) ) DEFINE_UNICOWS_THUNK( user32, HCONV, WINAPI, DdeConnect, (DWORD,HSZ,HSZ,PCONVCONTEXT) ) DEFINE_UNICOWS_THUNK( user32, HCONVLIST, WINAPI, DdeConnectList, (DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT) ) -DEFINE_UNICOWS_THUNK( user32, HSZ, WINAPI, DdeCreateStringHandleW, (DWORD,LPWSTR,int) ) +DEFINE_UNICOWS_THUNK( user32, HSZ, WINAPI, DdeCreateStringHandleW, (DWORD,LPCWSTR,int) ) DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeInitializeW, (PDWORD,PFNCALLBACK,DWORD,DWORD) ) DEFINE_UNICOWS_THUNK( user32, UINT, WINAPI, DdeQueryConvInfo, (HCONV,DWORD,PCONVINFO) ) DEFINE_UNICOWS_THUNK( user32, DWORD, WINAPI, DdeQueryStringW, (DWORD,HSZ,LPWSTR,DWORD,int) ) |