X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e448231102ecab3ce01647e98ec156f7bf5b8bb..84f7908b99660dc0556d9352c62ad717e679dd4d:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 5ac03f6416..c4742c529f 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -273,7 +273,7 @@ typedef _TUCHAR wxUChar; # if defined(__VISUALC__) && (__VISUALC__ < 900) # define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5 # elif defined(__UNIX__) -# if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || (defined(__DARWIN__)) +# if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__) # define wxUSE_WCHAR_T 1 # else # define wxUSE_WCHAR_T 0 @@ -296,12 +296,17 @@ typedef _TUCHAR wxUChar; # ifdef HAVE_WCSTR_H # include # else - // VZ: do we really have to include this? -# include - - // include wchar.h to get wcslen() declaration used by wx/buffer.h # if defined(HAVE_WCHAR_H) + +// include wchar.h to get wcslen() declaration used by wx/buffer.h # include + +# elif defined(__FreeBSD__) || defined(__DARWIN__) + +// include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp +# include +size_t WXDLLEXPORT wcslen(const wchar_t *s); + # endif # endif # endif