wchar/wcslen corrections for Darwin (same as FreeBSD)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -273,7 +273,7 @@ typedef _TUCHAR wxUChar;
|
|||||||
# if defined(__VISUALC__) && (__VISUALC__ < 900)
|
# if defined(__VISUALC__) && (__VISUALC__ < 900)
|
||||||
# define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
|
# define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
|
||||||
# elif defined(__UNIX__)
|
# 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
|
# define wxUSE_WCHAR_T 1
|
||||||
# else
|
# else
|
||||||
# define wxUSE_WCHAR_T 0
|
# define wxUSE_WCHAR_T 0
|
||||||
@@ -296,12 +296,12 @@ typedef _TUCHAR wxUChar;
|
|||||||
# ifdef HAVE_WCSTR_H
|
# ifdef HAVE_WCSTR_H
|
||||||
# include <wcstr.h>
|
# include <wcstr.h>
|
||||||
# else
|
# else
|
||||||
// VZ: do we really have to include this?
|
|
||||||
# include <stdlib.h>
|
|
||||||
|
|
||||||
// include wchar.h to get wcslen() declaration used by wx/buffer.h
|
// 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>
|
# include <wchar.h>
|
||||||
|
# elif defined(__FreeBSD__) || defined(__DARWIN__)
|
||||||
|
# include <stdlib.h>
|
||||||
|
# define wxNEED_WCSLEN
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
|
Reference in New Issue
Block a user