From 9d033af92e830d5636a3825a01b2cab00a6855a0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 4 Aug 2003 16:09:12 +0000
Subject: [PATCH] no changes, just resolved a conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/dynlib.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 3ab2153462..5bc1dc89b9 100644
--- 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
 }
 
-- 
2.50.0