Multilib linking fixes.

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 177a6db924d569a6c8dfc649e4ea445f04f17174..4e559f0fd69aaa4e5954aa6999692b489fb314ee 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -15,8 +15,8 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-int WXDLLIMPEXP_BASE wxStringSortAscending(wxString*, wxString*);
-int WXDLLIMPEXP_BASE wxStringSortDescending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxStringSortAscending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*);
 
 #if wxUSE_STL
 

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 37bda6581efd58627a2e807d921fdb7de5fa38b9..964324306b8c1817a44282e8df5ac4716eb3b7b2 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1763,10 +1763,10 @@ wxString& wxString::replace(size_t nStart, size_t nLen,
 // ArrayString
 // ============================================================================
 
-#if !wxUSE_STL
-
 #include "wx/arrstr.h"
 
+#if !wxUSE_STL
+
 // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
 #define   ARRAY_MAXSIZE_INCREMENT       4096