no changes, just resolved a conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 3ab2153462afdfdcaad3c8c0af9d4be295db10c8..5bc1dc89b92dcb10de62bb6da28563ac69403c28 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -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
 }