From: Mattia Barbon <mbarbon@cpan.org>
Date: Sat, 12 Jul 2003 02:22:22 +0000 (+0000)
Subject:   Multilib linking fixes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/22a5055f1f173fb140b222de69baba5022a63ed3?ds=inline

  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 177a6db924..4e559f0fd6 100644
--- 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 37bda6581e..964324306b 100644
--- 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