Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

char* cast on wxString libname blows up VC and VA. added .x_str(). Should have been wxChar* cast???

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-04-02 13:44:45 +00:00
parent 6359fa0e03
commit d236a959df
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/dynlib.cpp
View File

@@ -214,10 +214,10 @@ wxDllLoader::GetProgramHandle(void)
{ {
#if defined( HAVE_DLOPEN ) && !defined(__EMX__) #if defined( HAVE_DLOPEN ) && !defined(__EMX__)
// optain handle for main program // optain handle for main program
return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/); return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
#elif defined (HAVE_SHL_LOAD) #elif defined (HAVE_SHL_LOAD)
// shl_findsymbol with NULL handle looks up in main program // shl_findsymbol with NULL handle looks up in main program
return 0; return 0;
#else #else
wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2")); wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));
return 0; return 0;
@@ -247,7 +247,7 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
char zError[256] = ""; char zError[256] = "";
wxDllOpen(zError, libname, handle); wxDllOpen(zError, libname, handle);
#else // !Mac #else // !Mac
handle = wxDllOpen((char *)libname); handle = wxDllOpen((char *)libname.c_str());
#endif // OS #endif // OS
if ( !handle ) if ( !handle )