compilation warning (and possible bug) fix

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index ad2cd98fc1e32fc9db1d1c2e62157243e9b10078..c4742c529f671111a46f955955e5bb1dd7151d95 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -296,12 +296,17 @@ typedef  _TUCHAR     wxUChar;
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else
 #    ifdef HAVE_WCSTR_H
 #      include <wcstr.h>
 #    else

-       // include wchar.h to get wcslen() declaration used by wx/buffer.h

 #      if defined(HAVE_WCHAR_H)
 #      if defined(HAVE_WCHAR_H)

+
+// include wchar.h to get wcslen() declaration used by wx/buffer.h

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

+

 #      elif defined(__FreeBSD__) || defined(__DARWIN__)
 #      elif defined(__FreeBSD__) || defined(__DARWIN__)

+
+// include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp

 #        include <stdlib.h>
 #        include <stdlib.h>

-#        define wxNEED_WCSLEN
+size_t   WXDLLEXPORT wcslen(const wchar_t *s);
+

 #      endif
 #    endif
 #  endif
 #      endif
 #    endif
 #  endif