diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:50:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 12:50:58 +0000 |
| commit | 50700760a0fc29dcb95d473c3866d608a2bfc347 (patch) | |
| tree | a9d51fdced3d632ee96c9403b307981512380c74 /sal/systools | |
| parent | b0dd7183c1989732d454e2e034db8f24d4c142b1 (diff) | |
INTEGRATION: CWS mingwport06 (1.3.178); FILE MERGED
2007/08/24 13:06:54 vg 1.3.178.1: #i75499# pragma is for MSVC
Diffstat (limited to 'sal/systools')
| -rw-r--r-- | sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp | 4 | ||||
| -rw-r--r-- | sal/systools/win32/uwinapi/win95sys.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp index 7f02bf6d13d3..b66ebf6dab70 100644 --- a/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp +++ b/sal/systools/win32/uwinapi/GetModuleFileNameExA.cpp @@ -1,7 +1,11 @@ #include "macros.h" +#ifdef _MSC_VER #pragma warning(push,1) // disable warnings within system headers +#endif #include <psapi.h> +#ifdef _MSC_VER #pragma warning(pop) +#endif #include <tlhelp32.h> IMPLEMENT_THUNK( psapi, WINDOWS, DWORD, WINAPI, GetModuleFileNameExA, (HANDLE hProcess, HMODULE hModule, LPSTR lpFileName, DWORD nSize ) ) diff --git a/sal/systools/win32/uwinapi/win95sys.h b/sal/systools/win32/uwinapi/win95sys.h index b1a495093b34..4ca0c8e8fcff 100644 --- a/sal/systools/win32/uwinapi/win95sys.h +++ b/sal/systools/win32/uwinapi/win95sys.h @@ -49,7 +49,9 @@ #define fWasOemNowAnsi 0x00000200 #define fOKToSetThreadOem 0x00000400 +#ifdef _MSC_VER #pragma warning(disable:4103) +#endif #pragma pack(1) |