diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:20:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:20:20 +0000 |
| commit | 9dd66653607a7385986bfe0c4c871574fe81632d (patch) | |
| tree | 13a8d6a47056fea6f11e99424852780ac448a13f /sal/osl/w32/dllentry.c | |
| parent | dff77d229e17a352a1de1973190ffe782b25d033 (diff) | |
INTEGRATION: CWS warnings01 (1.22.94); FILE MERGED
2006/05/24 00:20:44 sb 1.22.94.4: RESYNC: (1.24-1.25); FILE MERGED
2006/04/07 21:02:46 sb 1.22.94.3: RESYNC: (1.23-1.24); FILE MERGED
2005/09/23 00:58:28 sb 1.22.94.2: RESYNC: (1.22-1.23); FILE MERGED
2005/09/20 12:57:18 sb 1.22.94.1: #i53898# Globally disable problematic warnings.
Diffstat (limited to 'sal/osl/w32/dllentry.c')
| -rw-r--r-- | sal/osl/w32/dllentry.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c index 529903833e3f..d0d2ac94b101 100644 --- a/sal/osl/w32/dllentry.c +++ b/sal/osl/w32/dllentry.c @@ -4,9 +4,9 @@ * * $RCSfile: dllentry.c,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2006-05-02 12:10:00 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:20:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,9 @@ * ************************************************************************/ +#pragma warning(push,1) /* disable warnings within system headers */ #include <windows.h> +#pragma warning(pop) #include <tlhelp32.h> #include <systools/win32/uwinapi.h> #include <winsock.h> @@ -303,6 +305,8 @@ static DWORD WINAPI ParentMonitorThreadProc( LPVOID lpParam ) BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) { + (void)hinstDLL; /* avoid warning */ + (void)lpvReserved; /* avoid warning */ switch (fdwReason) { case DLL_PROCESS_ATTACH: |