equal
deleted
inserted
replaced
1 Patch origin: in-house |
|
2 Patch status: Solaris-specific; not suitable for upstream |
|
3 |
|
4 Workaround for: |
|
5 |
|
6 23234483 - some functions are not exported in default C++ namespace in wchar.h |
|
7 |
|
8 --- wxWidgets-3.0.2/include/wx/wxcrtbase.h |
|
9 +++ wxWidgets-3.0.2/include/wx/wxcrtbase.h |
|
10 @@ -180,7 +180,7 @@ |
|
11 !(defined(__CYGWIN__) || defined(__WX_STRICT_ANSI_GCC__)) |
|
12 #define wxCRT_StrdupW _wcsdup |
|
13 #elif defined(HAVE_WCSDUP) |
|
14 - #define wxCRT_StrdupW wcsdup |
|
15 + #define wxCRT_StrdupW std::wcsdup |
|
16 #endif |
|
17 |
|
18 #ifdef wxHAVE_TCHAR_SUPPORT |
|
19 @@ -238,7 +238,7 @@ |
|
20 #endif |
|
21 |
|
22 #ifdef HAVE_WCSNLEN |
|
23 - #define wxCRT_StrnlenW wcsnlen |
|
24 + #define wxCRT_StrnlenW std::wcsnlen |
|
25 #endif |
|
26 |
|
27 /* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */ |
|
28 @@ -262,10 +262,10 @@ |
|
29 #define wxCRT_StrnicmpW _wcsnicmp |
|
30 #elif defined(__UNIX__) |
|
31 #ifdef HAVE_WCSCASECMP |
|
32 - #define wxCRT_StricmpW wcscasecmp |
|
33 + #define wxCRT_StricmpW std::wcscasecmp |
|
34 #endif |
|
35 #ifdef HAVE_WCSNCASECMP |
|
36 - #define wxCRT_StrnicmpW wcsncasecmp |
|
37 + #define wxCRT_StrnicmpW std::wcsncasecmp |
|
38 #endif |
|
39 /* #else -- use wxWidgets implementation */ |
|
40 #endif |
|