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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index f7c77daeb7ca40c12005097857c94df4f4c49e64..0f5f16d2e71e09f9cfdc170c65d72603fcca2124 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -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 wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; }
 #ifndef wxWCHAR_T_IS_WXCHAR16
 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; }
 #ifndef wxWCHAR_T_IS_WXCHAR16

-       size_t wxStrlen(const wxChar16 *s );
+       WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s );

 #endif
 #ifndef wxWCHAR_T_IS_WXCHAR32
 #endif
 #ifndef wxWCHAR_T_IS_WXCHAR32

-       size_t wxStrlen(const wxChar32 *s );
+       WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s );

 #endif
 #define wxWcslen wxCRT_StrlenW
 
 #endif
 #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 wchar_t* wxStrdup(const wchar_t *s) { return wxCRT_StrdupW(s); }
 #ifndef wxWCHAR_T_IS_WXCHAR16
 inline char* wxStrdup(const char *s) { return wxCRT_StrdupA(s); }
 inline wchar_t* wxStrdup(const wchar_t *s) { return wxCRT_StrdupW(s); }
 #ifndef wxWCHAR_T_IS_WXCHAR16

-       wxChar16* wxStrdup(const wxChar16* s);
+       WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s);

 #endif
 #ifndef wxWCHAR_T_IS_WXCHAR32
 #endif
 #ifndef wxWCHAR_T_IS_WXCHAR32

-       wxChar32* wxStrdup(const wxChar32* s);
+       WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s);

 #endif
 
 #endif /* __cplusplus */
 #endif
 
 #endif /* __cplusplus */

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 5a114a368d26eb65a7880b66e8c2c5214b0d8aa6..9dbdc1b39263f1018005ae58d53674a2494ab43c 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -797,7 +797,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz)
 #endif // wxCRT_StrdupW
 
 #ifndef wxWCHAR_T_IS_WXCHAR16
 #endif // wxCRT_StrdupW
 
 #ifndef wxWCHAR_T_IS_WXCHAR16

-WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s ) 
+size_t wxStrlen(const wxChar16 *s ) 

 { 
     if (!s) return 0; 
     size_t i=0; 
 { 
     if (!s) return 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); 
   wxChar16 *ret = (wxChar16*) malloc(size);
 { 
   size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16); 
   wxChar16 *ret = (wxChar16*) malloc(size);


@@ -815,7 +815,7 @@ WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s)
 #endif
 
 #ifndef wxWCHAR_T_IS_WXCHAR32
 #endif
 
 #ifndef wxWCHAR_T_IS_WXCHAR32

-WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s ) 
+size_t wxStrlen(const wxChar32 *s ) 

 { 
     if (!s) return 0; 
     size_t i=0; 
 { 
     if (!s) return 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); 
   wxChar32 *ret = (wxChar32*) malloc(size);
 { 
   size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32); 
   wxChar32 *ret = (wxChar32*) malloc(size);