diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 12:28:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 12:28:41 +0000 |
| commit | c902b1438c82e49fa601888915d1ae34b1194a68 (patch) | |
| tree | ab0722d028c2696280f4b136fc3e9880f347298a | |
| parent | d86ce19f0d69093bf021bf5c74f7df9d8c4a02bd (diff) | |
INTEGRATION: CWS sal05 (1.19.88); FILE MERGED
2004/01/24 13:18:11 tra 1.19.88.2: RESYNC: (1.19-1.20); FILE MERGED
2003/11/03 12:31:01 tra 1.19.88.1: #112918#removed most warnings that will be generated when compiling osl with -Wall, explicitly disabled the following warnings which have been regarded as unnecessary 4820, 4668, 4711, 4201, 4217, 4710, 4619, 4514
| -rw-r--r-- | sal/osl/w32/dllentry.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c index 32e1fa21d..b67389c35 100644 --- a/sal/osl/w32/dllentry.c +++ b/sal/osl/w32/dllentry.c @@ -2,9 +2,9 @@ * * $RCSfile: dllentry.c,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2004-01-07 16:26:25 $ + * last change: $Author: hr $ $Date: 2004-02-03 13:28:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,7 +160,7 @@ static sal_Bool showMessage(int MessageId) // InitDCOM //------------------------------------------------------------------------------ -static void InitDCOM( ) +static void InitDCOM(void) { HINSTANCE hInstance = GetModuleHandle( "ole32.dll" ); @@ -181,6 +181,10 @@ static void InitDCOM( ) static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) { + /* avoid warnings */ + hinstDLL = hinstDLL; + lpvReserved = lpvReserved; + switch (fdwReason) { case DLL_PROCESS_ATTACH: |