From a51fdf81b92e43c7b6167aca131f0a3b9b6724cb Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sat, 18 Apr 2009 08:08:56 +0000 Subject: [PATCH] blind wxOS2 build fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/string.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/string.cpp b/src/common/string.cpp index af0b91750e..511068e101 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1691,7 +1691,7 @@ bool wxString::ToCLong(long *pVal, int base) const wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); WX_STRING_TO_X_TYPE_START -#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE +#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT) long val = wxStrtol_lA(start, &end, base, wxCLocale); #else long val = wxStrtol_l(start, &end, base, wxCLocale); @@ -1704,7 +1704,7 @@ bool wxString::ToCULong(unsigned long *pVal, int base) const wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); WX_STRING_TO_X_TYPE_START -#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE +#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT) unsigned long val = wxStrtoul_lA(start, &end, base, wxCLocale); #else unsigned long val = wxStrtoul_l(start, &end, base, wxCLocale); @@ -1715,7 +1715,7 @@ bool wxString::ToCULong(unsigned long *pVal, int base) const bool wxString::ToCDouble(double *pVal) const { WX_STRING_TO_X_TYPE_START -#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE +#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT) double val = wxStrtod_lA(start, &end, wxCLocale); #else double val = wxStrtod_l(start, &end, wxCLocale); -- 2.45.2