Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blind fix for compilation under AIX: always include wchar.h if available, even if we have wcstr.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-25 14:06:42 +00:00
parent f0c87536e1
commit a27d279f9d
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
include/wx/wxchar.h
View File

@@ -293,29 +293,24 @@ typedef _TUCHAR wxUChar;
# elif defined(__VISAGECPP__) && (__IBMCPP__ < 400) # elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
# define wxUSE_WCHAR_T 0 # define wxUSE_WCHAR_T 0
# else # else
// add additional compiler checks if this fails // add additional compiler checks if this fails
# define wxUSE_WCHAR_T 1 # define wxUSE_WCHAR_T 1
# endif # endif
# endif // !defined(wxUSE_WCHAR_T) # endif // !defined(wxUSE_WCHAR_T)
# if wxUSE_WCHAR_T # if wxUSE_WCHAR_T
# ifdef HAVE_WCSTR_H # ifdef HAVE_WCHAR_H
# include <wcstr.h> // include wchar.h to get wcslen() declaration used by wx/buffer.h
# else # include <wchar.h>
# if defined(HAVE_WCHAR_H) # elif defined(HAVE_WCSTR_H)
// old compilers have wcslen() here
// include wchar.h to get wcslen() declaration used by wx/buffer.h # include <wcstr.h>
# include <wchar.h> # elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
// include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp
# elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__) # include <stdlib.h>
size_t WXDLLEXPORT wcslen(const wchar_t *s);
// include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp # endif // HAVE_WCHAR_H
# include <stdlib.h> # endif // wxUSE_WCHAR_T
size_t WXDLLEXPORT wcslen(const wchar_t *s);
# endif
# endif
# endif
// check whether we are doing Unicode // check whether we are doing Unicode
# if wxUSE_UNICODE # if wxUSE_UNICODE
@@ -388,15 +383,9 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
# include <ctype.h> # include <ctype.h>
# include <string.h> # include <string.h>
# if 0 // temporary - preserve binary compatibilty typedef char wxChar;
typedef char wxChar; typedef signed char wxSChar;
typedef signed char wxSChar; typedef unsigned char wxUChar;
typedef unsigned char wxUChar;
# else
# define wxChar char
# define wxSChar signed char
# define wxUChar unsigned char
# endif
# if defined(__FreeBSD__) || defined(__DARWIN__) # if defined(__FreeBSD__) || defined(__DARWIN__)
# undef _T # undef _T