Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct use of WXDLLIMPEXP_BASE for wxChar16 wxStrlen() overloads (#9827)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-05 17:13:03 +00:00
parent 2a998b7344
commit 16882c9e37
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/wxcrtbase.h
View File

@@ -665,10 +665,10 @@ WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
inline size_t wxStrlen(const char *s) { return s ? wxCRT_StrlenA(s) : 0; } inline size_t wxStrlen(const char *s) { return s ? wxCRT_StrlenA(s) : 0; }
inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; } inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; }
#ifndef wxWCHAR_T_IS_WXCHAR16 #ifndef wxWCHAR_T_IS_WXCHAR16
size_t wxStrlen(const wxChar16 *s ); WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s );
#endif #endif
#ifndef wxWCHAR_T_IS_WXCHAR32 #ifndef wxWCHAR_T_IS_WXCHAR32
size_t wxStrlen(const wxChar32 *s ); WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s );
#endif #endif
#define wxWcslen wxCRT_StrlenW #define wxWcslen wxCRT_StrlenW
@@ -677,10 +677,10 @@ inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; }
inline char* wxStrdup(const char *s) { return wxCRT_StrdupA(s); } inline char* wxStrdup(const char *s) { return wxCRT_StrdupA(s); }
inline wchar_t* wxStrdup(const wchar_t *s) { return wxCRT_StrdupW(s); } inline wchar_t* wxStrdup(const wchar_t *s) { return wxCRT_StrdupW(s); }
#ifndef wxWCHAR_T_IS_WXCHAR16 #ifndef wxWCHAR_T_IS_WXCHAR16
wxChar16* wxStrdup(const wxChar16* s); WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s);
#endif #endif
#ifndef wxWCHAR_T_IS_WXCHAR32 #ifndef wxWCHAR_T_IS_WXCHAR32
wxChar32* wxStrdup(const wxChar32* s); WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s);
#endif #endif
#endif /* __cplusplus */ #endif /* __cplusplus */

8
src/common/wxcrt.cpp
View File

@@ -797,7 +797,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz)
#endif // wxCRT_StrdupW #endif // wxCRT_StrdupW
#ifndef wxWCHAR_T_IS_WXCHAR16 #ifndef wxWCHAR_T_IS_WXCHAR16
WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s ) size_t wxStrlen(const wxChar16 *s )
{ {
if (!s) return 0; if (!s) return 0;
size_t i=0; size_t i=0;
@@ -805,7 +805,7 @@ WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s )
return i; return i;
} }
WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s) wxChar16* wxStrdup(const wxChar16* s)
{ {
size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16);
wxChar16 *ret = (wxChar16*) malloc(size); wxChar16 *ret = (wxChar16*) malloc(size);
@@ -815,7 +815,7 @@ WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s)
#endif #endif
#ifndef wxWCHAR_T_IS_WXCHAR32 #ifndef wxWCHAR_T_IS_WXCHAR32
WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s ) size_t wxStrlen(const wxChar32 *s )
{ {
if (!s) return 0; if (!s) return 0;
size_t i=0; size_t i=0;
@@ -823,7 +823,7 @@ WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s )
return i; return i;
} }
WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s) wxChar32* wxStrdup(const wxChar32* s)
{ {
size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32);
wxChar32 *ret = (wxChar32*) malloc(size); wxChar32 *ret = (wxChar32*) malloc(size);