From: Julian Smart Date: Mon, 23 May 2005 15:38:21 +0000 (+0000) Subject: Reverted namespace patch X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8241721975a1a0dbaabc0ecc8aa0a0ce71a8da24 Reverted namespace patch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 98e3936404..139f540611 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -473,24 +473,24 @@ #endif /* gcc/!gcc */ /* string.h functions (wchar.h) */ - #define wxStrcat ::wcscat - #define wxStrchr ::wcschr - #define wxStrcmp ::wcscmp - #define wxStrcoll ::wcscoll - #define wxStrcpy ::wcscpy - #define wxStrcspn ::wcscspn + #define wxStrcat wcscat + #define wxStrchr wcschr + #define wxStrcmp wcscmp + #define wxStrcoll wcscoll + #define wxStrcpy wcscpy + #define wxStrcspn wcscspn #define wxStrlen_ wxWcslen /* wxStrlen_() is used in wxStrlen() */ - #define wxStrncat ::wcsncat - #define wxStrncmp ::wcsncmp - #define wxStrncpy ::wcsncpy - #define wxStrpbrk ::wcspbrk - #define wxStrrchr ::wcsrchr - #define wxStrspn ::wcsspn - #define wxStrstr ::wcsstr - #define wxStrtod ::wcstod - #define wxStrtol ::wcstol - #define wxStrtoul ::wcstoul - #define wxStrxfrm ::wcsxfrm + #define wxStrncat wcsncat + #define wxStrncmp wcsncmp + #define wxStrncpy wcsncpy + #define wxStrpbrk wcspbrk + #define wxStrrchr wcsrchr + #define wxStrspn wcsspn + #define wxStrstr wcsstr + #define wxStrtod wcstod + #define wxStrtol wcstol + #define wxStrtoul wcstoul + #define wxStrxfrm wcsxfrm #define wxFgetc fgetwc #define wxFgetchar fgetwchar