From f98e742929e4ec49802f61bdb2d60b94cae0c321 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 22 May 2005 14:12:29 +0000 Subject: [PATCH] Applied patch [ 1190194 ] Define some string macros to refer to :: functions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxchar.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 139f540611..98e3936404 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