who forward declared wcslen() without using extern "C" around it?? and why was it...

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 55cf190209b30d792237bd9d766f0de7c05f77ae..cb07176438d577cb594f7b76e49ef5e996e3086f 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -288,10 +288,11 @@ typedef  _TUCHAR     wxUChar;
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else

-#      if defined(__FreeBSD__) || defined(__DARWIN__)
-#        include <stdlib.h>
-#        define wxNEED_WCSLEN
-#      else
+       // VZ: do we really have to include this?
+#      include <stdlib.h>
+
+       // include wchar.h to get wcslen() declaration used by wx/buffer.h
+#      if defined(HAVE_WCHAR_H)

 #        include <wchar.h>
 #      endif
 #    endif
 #        include <wchar.h>
 #      endif
 #    endif


@@ -517,11 +518,6 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #  endif
 #endif //!Unicode
 
 #  endif
 #endif //!Unicode
 

-#if defined(wxNEED_WCSLEN) && wxUSE_UNICODE
-#  define wcslen wxStrlen
-#  undef wxNEED_WCSLEN
-#endif
-

 // checks whether the passed in pointer is NULL and if the string is empty
 inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
 
 // checks whether the passed in pointer is NULL and if the string is empty
 inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
 


@@ -580,10 +576,6 @@ class wxWCharBuffer;
 WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
 #endif
 
 WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
 #endif
 

-#ifdef wxNEED_WCSLEN // for use in buffer.h
-WXDLLEXPORT size_t   wcslen(const wchar_t *s);
-#endif
-

 #ifdef wxNEED_WX_CTYPE_H
 WXDLLEXPORT int wxIsalnum(wxChar ch);
 WXDLLEXPORT int wxIsalpha(wxChar ch);
 #ifdef wxNEED_WX_CTYPE_H
 WXDLLEXPORT int wxIsalnum(wxChar ch);
 WXDLLEXPORT int wxIsalpha(wxChar ch);