diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:32:35 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:32:35 +0000 |
| commit | 392d0380e1d73695a89e4d2efc20c6699a1b17f3 (patch) | |
| tree | 7494e586ac45e99fdf0f0f32f106d6a778de1ab0 /sal | |
| parent | b79d443d7855d0031e5e035e9d8f12611646d2aa (diff) | |
INTEGRATION: CWS warnings01 (1.3.336); FILE MERGED
2005/09/23 01:33:30 sb 1.3.336.2: RESYNC: (1.3-1.4); FILE MERGED
2005/09/20 12:57:23 sb 1.3.336.1: #i53898# Globally disable problematic warnings.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/systools/win32/uwinapi/DllMain.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sal/systools/win32/uwinapi/DllMain.cpp b/sal/systools/win32/uwinapi/DllMain.cpp index 055d35d58059..673534af7211 100644 --- a/sal/systools/win32/uwinapi/DllMain.cpp +++ b/sal/systools/win32/uwinapi/DllMain.cpp @@ -4,9 +4,9 @@ * * $RCSfile: DllMain.cpp,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:12:04 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:32:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,7 +34,9 @@ ************************************************************************/ #define WIN32_LEAN_AND_MEAN +#pragma warning(push,1) // disable warnings within system headers #include <windows.h> +#pragma warning(pop) #include <malloc.h> #define _MBCS #include <tchar.h> @@ -126,7 +128,7 @@ static HMODULE WINAPI LoadUnicowsLibrary(VOID) extern "C" FARPROC _PfnLoadUnicows = (FARPROC)LoadUnicowsLibrary; -extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID lpReserved ) +extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID ) { switch ( dwReason ) { |