From 4dc2c3bbc5bc04b6239e14a7ec4e3ddc400a00bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Tue, 8 Jun 1999 12:17:00 +0000 Subject: [PATCH] Fixed compilation, sorry for that. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynlib.h | 2 +- src/common/dynlib.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h index b752cc3c74..68a16fceaf 100644 --- a/include/wx/dynlib.h +++ b/include/wx/dynlib.h @@ -72,7 +72,7 @@ class wxDllLoader @param success Must point to a bool variable which will be set to TRUE or FALSE. @return A handle to the loaded DLL. Use success parameter to test if it is valid. */ - static wxDllType LoadDll(const wxString & libname, bool *success); + static wxDllType LoadLibrary(const wxString & libname, bool *success); /** This function resolves a symbol in a loaded DLL, such as a variable or function name. @param dllHandle Handle of the DLL, as returned by LoadDll(). diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 1e0fc6bdf4..dd2cfa443e 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -174,7 +174,7 @@ void *wxLibrary::GetSymbol(const wxString& symbname) /* static */ wxDllType -wxDllLoader::LoadLibrary(const wxString & libname, bool *success) +wxDllLoader::LoadLibrary(const wxString & lib_name, bool *success) { wxASSERT(success); @@ -231,7 +231,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name) if ( !symbol ) { wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"), - symbname.c_str()); + name.c_str()); } return symbol; } @@ -300,8 +300,8 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name) #endif // __UNIX__ #endif - bool success; - handle = wxDllLoader::LoadDll(lib_name, &success); + bool success = FALSE; + wxDllType handle = wxDllLoader::LoadDll(lib_name, &success); if(success) { lib = new wxLibrary(handle); -- 2.47.2