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

compilation fix for cygwin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-09-10 11:54:47 +00:00
parent 9b11cb6e3f
commit 69429a166f
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/wxchar.h
View File

@@ -53,7 +53,7 @@
#else #else
#define wxUSE_WCHAR_T 0 #define wxUSE_WCHAR_T 0
#endif #endif
#elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h #elif defined(__GNUWIN32__) && !defined(__MINGW32__)
#define wxUSE_WCHAR_T 0 #define wxUSE_WCHAR_T 0
#elif defined(__WATCOMC__) #elif defined(__WATCOMC__)
#define wxUSE_WCHAR_T 0 #define wxUSE_WCHAR_T 0
@@ -80,13 +80,6 @@
// Required for wxPrintf() etc // Required for wxPrintf() etc
#include <stdarg.h> #include <stdarg.h>
#if defined(__CYGWIN__)
#ifndef HAVE_WCSLEN
#define HAVE_WCSLEN
#endif // !HAVE_WCSLEN
#include <stddef.h>
#endif
// non Unix compilers which do have wchar.h (but not tchar.h which is included // non Unix compilers which do have wchar.h (but not tchar.h which is included
// below and which includes wchar.h anyhow) // below and which includes wchar.h anyhow)
#if defined(__MWERKS__) || defined(__VISAGECPP__) #if defined(__MWERKS__) || defined(__VISAGECPP__)
@@ -97,15 +90,13 @@
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
#ifdef HAVE_WCHAR_H #ifdef HAVE_WCHAR_H
// include wchar.h to get wcslen() declaration used by wx/buffer.h
#include <wchar.h> #include <wchar.h>
#elif defined(HAVE_WCSTR_H) #elif defined(HAVE_WCSTR_H)
// old compilers have wcslen() here // old compilers have relevant declarations here
#include <wcstr.h> #include <wcstr.h>
#elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__) #elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
// include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp // include stdlib.h for wchar_t
#include <stdlib.h> #include <stdlib.h>
size_t WXDLLEXPORT wcslen(const wchar_t *s);
#endif // HAVE_WCHAR_H #endif // HAVE_WCHAR_H
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
@@ -375,7 +366,7 @@
#define wxStrcoll wcscoll #define wxStrcoll wcscoll
#define wxStrcpy wcscpy #define wxStrcpy wcscpy
#define wxStrcspn wcscspn #define wxStrcspn wcscspn
#define wxStrlen_ wcslen // used in wxStrlen inline function #define wxStrlen_ wxWcslen // wxStrlen_() is used in wxStrlen()
#define wxStrncat wcsncat #define wxStrncat wcsncat
#define wxStrncmp wcsncmp #define wxStrncmp wcsncmp
#define wxStrncpy wcsncpy #define wxStrncpy wcsncpy