From: Vadim Zeitlin Date: Sun, 8 Sep 2002 00:47:56 +0000 (+0000) Subject: don't #define wxStrtok() which takes 3 arguments as wcstok() which takes only 2,... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7e92d86d78e2a5e8d5dc4aa89e3c28af1d9ed76a 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 --- diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index a8ce78ad9f..6aea1283b1 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -384,7 +384,6 @@ #define wxStrspn wcsspn #define wxStrstr wcsstr #define wxStrtod wcstod - #define wxStrtok wcstok #define wxStrtol wcstol #define wxStrtoul wcstoul #define wxStrxfrm wcsxfrm @@ -471,8 +470,6 @@ #define wxStrtod strtod #ifdef HAVE_STRTOK_R #define wxStrtok(str, sep, last) strtok_r(str, sep, last) - #else - #define wxStrtok(str, sep, last) strtok(str, sep) #endif #define wxStrtol strtol #define wxStrtoul strtoul