diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:16:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:16:14 +0000 |
| commit | a3ddf908fded24cc2e5b057abc2f9e572a8b6c94 (patch) | |
| tree | 9775cb23c7e9ed0aba308bb9de6165878babe96e /sal/osl/w32 | |
| parent | 6de04b300c4705771fe7e3a973c29643919f2db2 (diff) | |
INTEGRATION: CWS sb83 (1.31.24); FILE MERGED
2008/02/01 13:28:36 sb 1.31.24.2: RESYNC: (1.31-1.32); FILE MERGED
2007/12/21 14:47:36 sb 1.31.24.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop) (but needed on all Windows platforms); cleaned up.
Diffstat (limited to 'sal/osl/w32')
| -rw-r--r-- | sal/osl/w32/dllentry.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c index c28116d96623..353b6711bddd 100644 --- a/sal/osl/w32/dllentry.c +++ b/sal/osl/w32/dllentry.c @@ -4,9 +4,9 @@ * * $RCSfile: dllentry.c,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: rt $ $Date: 2008-01-29 14:50:28 $ + * last change: $Author: vg $ $Date: 2008-03-18 13:16:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,7 +92,6 @@ _pRawDllMain() static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ); extern BOOL (WINAPI *_pRawDllMain)(HANDLE, DWORD, LPVOID) = _RawDllMain; -extern HMODULE __hCurrentModule; #endif @@ -176,14 +175,12 @@ static void do_startup( void ) #else static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) { - /* avoid warnings */ - hinstDLL = hinstDLL; - lpvReserved = lpvReserved; + (void)hinstDLL; /* avoid warnings */ + (void)lpvReserved; /* avoid warnings */ switch (fdwReason) { case DLL_PROCESS_ATTACH: - __hCurrentModule = hinstDLL; { #endif OSVERSIONINFO aInfo; |