X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18ed8e00326db485a35eef1d03706e4a455111d7..3b6a1179621302e72f6d563d87aa2eabf1d8ce5d:/src/common/dynlib.cpp diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index c631d06b30..2e8afc8f00 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dynlib.cpp +// Name: src/common/dynlib.cpp // Purpose: Dynamic library management // Author: Guilhem Lavaux // Modified by: @@ -21,10 +21,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -# pragma implementation "dynlib.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -48,7 +44,7 @@ #include "wx/mac/private.h" #endif -WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray); +WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray) // ============================================================================ // implementation @@ -121,7 +117,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) #elif defined(__WXPM__) || defined(__EMX__) char err[256] = ""; DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle); -#else +#else // this should be the only remaining branch eventually m_handle = RawLoad(libname, flags); #endif @@ -145,7 +141,7 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) /* static */ void wxDynamicLibrary::Unload(wxDllType handle) { -#if defined(__WXPM__) || defined(__EMX__) +#if defined(__OS2__) || defined(__EMX__) DosFreeModule( handle ); #elif defined(__WXMAC__) && !defined(__DARWIN__) CloseConnection( (CFragConnectionID*) &handle );