From: David Webster <Dave.Webster@bhmi.com>
Date: Mon, 24 Sep 2001 19:17:16 +0000 (+0000)
Subject: patch fix for a constant definition under OS/2 VA V4.0
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/75ad8febf6c3f61532c3514471a018805cc229f9

patch fix for a constant definition under OS/2 VA V4.0


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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 9c01501994..b70809c939 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -70,6 +70,12 @@
 // static class variables definition
 // ---------------------------------------------------------------------------
 
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+// must define this static for VA or else you get multiply defined symbols
+// everywhere
+const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
+#endif // Visual Age
+
 #ifdef  wxSTD_STRING_COMPATIBILITY
   const size_t wxString::npos = wxSTRING_MAXLEN;
 #endif // wxSTD_STRING_COMPATIBILITY
@@ -87,12 +93,6 @@ static const struct
   wxChar dummy;
 } g_strEmpty = { {-1, 0, 0}, wxT('\0') };
 
-#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-// must define this static for VA or else you get multiply defined symbols
-// everywhere
-const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
-#endif // Visual Age
-
 // empty C style string: points to 'string data' byte of g_strEmpty
 extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;