X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e96e5030cd899ac43e9f6e7e9302d25644a05e9..58e041b75320b509fe01cfb9d7057990e4a60f04:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 0f65f8ef3b..98e3936404 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -5,7 +5,7 @@ * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee * Created: 1998/06/12 * RCS-ID: $Id$ - * Copyright: (c) 1998-2002 wxWidgets dev team + * Copyright: (c) 1998-2002 Joel Farley, Ove Kåven, Robert Roebling, Ron Lee * Licence: wxWindows licence */ @@ -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