no changes, just resolved a conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -300,7 +300,8 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
|
||||
return IsLoaded();
|
||||
}
|
||||
|
||||
/* static */ void wxDynamicLibrary::Unload(wxDllType handle)
|
||||
/* static */
|
||||
void wxDynamicLibrary::Unload(wxDllType handle)
|
||||
{
|
||||
#if defined(__WXPM__) || defined(__EMX__)
|
||||
DosFreeModule( handle );
|
||||
@@ -313,7 +314,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
|
||||
#elif defined(__WXMAC__) && !defined(__DARWIN__)
|
||||
CloseConnection( (CFragConnectionID*) &handle );
|
||||
#else
|
||||
#error "runtime shared lib support not implemented"
|
||||
#error "runtime shared lib support not implemented"
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user