don't #define wxStrtok() which takes 3 arguments as wcstok() which takes only 2, this can't compile in Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -384,7 +384,6 @@
|
|||||||
#define wxStrspn wcsspn
|
#define wxStrspn wcsspn
|
||||||
#define wxStrstr wcsstr
|
#define wxStrstr wcsstr
|
||||||
#define wxStrtod wcstod
|
#define wxStrtod wcstod
|
||||||
#define wxStrtok wcstok
|
|
||||||
#define wxStrtol wcstol
|
#define wxStrtol wcstol
|
||||||
#define wxStrtoul wcstoul
|
#define wxStrtoul wcstoul
|
||||||
#define wxStrxfrm wcsxfrm
|
#define wxStrxfrm wcsxfrm
|
||||||
@@ -471,8 +470,6 @@
|
|||||||
#define wxStrtod strtod
|
#define wxStrtod strtod
|
||||||
#ifdef HAVE_STRTOK_R
|
#ifdef HAVE_STRTOK_R
|
||||||
#define wxStrtok(str, sep, last) strtok_r(str, sep, last)
|
#define wxStrtok(str, sep, last) strtok_r(str, sep, last)
|
||||||
#else
|
|
||||||
#define wxStrtok(str, sep, last) strtok(str, sep)
|
|
||||||
#endif
|
#endif
|
||||||
#define wxStrtol strtol
|
#define wxStrtol strtol
|
||||||
#define wxStrtoul strtoul
|
#define wxStrtoul strtoul
|
||||||
|
Reference in New Issue
Block a user