From: Vadim Zeitlin Date: Thu, 22 Apr 2010 14:16:12 +0000 (+0000) Subject: Define wxStrto{d,l,ul}_l() functions in non-Unicode build too. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6dfe3a3aee629d14d4b86d816e5b81c3d0cadfd7?ds=inline Define wxStrto{d,l,ul}_l() functions in non-Unicode build too. This fixes the unit test compilation in ANSI build. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h index 936e3fc39e..665fb6ecef 100644 --- a/include/wx/xlocale.h +++ b/include/wx/xlocale.h @@ -302,8 +302,14 @@ extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale; { return wxCRT_Strtol_lW(c, endptr, base, loc.Get()); } inline unsigned long wxStrtoul_l(const wchar_t *c, wchar_t **endptr, int base, const wxXLocale& loc) { return wxCRT_Strtoul_lW(c, endptr, base, loc.Get()); } - - #endif // wxUSE_UNICDE (ctype functions) + #else // !wxUSE_UNICODE + inline double wxStrtod_l(const char *c, char **endptr, const wxXLocale& loc) + { return wxCRT_Strtod_lA(c, endptr, loc.Get()); } + inline long wxStrtol_l(const char *c, char **endptr, int base, const wxXLocale& loc) + { return wxCRT_Strtol_lA(c, endptr, base, loc.Get()); } + inline unsigned long wxStrtoul_l(const char *c, char **endptr, int base, const wxXLocale& loc) + { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); } + #endif // wxUSE_UNICODE #else // !wxHAS_XLOCALE_SUPPORT // ctype functions int WXDLLIMPEXP_BASE wxIsalnum_l(const wxUniChar& c, const wxXLocale& loc);