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

Cygwin doesn't have std::wstring nor std::wostream

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-12 17:08:45 +00:00
parent 53e34ee6fa
commit 3cd9070c78
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/defs.h
View File

@@ -303,8 +303,7 @@ typedef short int WXTYPE;
#if defined(__VISUALC__) && (__VISUALC__ >= 1100) #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
/* VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) */ /* VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) */
#define HAVE_STD_WSTRING #define HAVE_STD_WSTRING
#elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \ #elif defined(__MINGW32__) && wxCHECK_GCC_VERSION(3, 3)
&& wxCHECK_GCC_VERSION(3, 3)
/* GCC 3.1 has std::wstring; 3.0 never was in MinGW, 2.95 hasn't it */ /* GCC 3.1 has std::wstring; 3.0 never was in MinGW, 2.95 hasn't it */
#define HAVE_STD_WSTRING #define HAVE_STD_WSTRING
#endif #endif
@@ -374,10 +373,11 @@ typedef short int WXTYPE;
#ifndef HAVE_WOSTREAM #ifndef HAVE_WOSTREAM
// Mingw <= 3.4 and any version (so far) when targetting PalmOS don't have // Mingw <= 3.4 and all versions of Cygwin as well as any gcc version (so
// std::wostream // far) targeting PalmOS don't have std::wostream
#if defined(__PALMOS__) || \ #if defined(__PALMOS__) || \
(defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) (defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \
defined(__CYGWIN__)
#define wxNO_WOSTREAM #define wxNO_WOSTREAM
#endif #endif