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
This commit is contained in:
@@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user