diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-09-26 21:55:04 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-09-26 21:55:04 +0000 |
| commit | d9a011696e8234cb1eb9cb597a3d410d7aa34662 (patch) | |
| tree | 74022d4cdf77d315a0310b27665bc637848d6809 /winsup/mingw/include/wchar.h | |
| parent | 57ba8c6aa4329499a712dc17d25cd01c7db86dd4 (diff) | |
| download | gdb-d9a011696e8234cb1eb9cb597a3d410d7aa34662.tar.gz | |
* include/wchar: #include sys/types.h in non-ANSI mode.
Protect _Wint_t typedef with __STRICT_ANSI__. Remove from std
namespace.
Fix comment about string functions.
Correct spelling of setjmp.h in ChangeLog.
Diffstat (limited to 'winsup/mingw/include/wchar.h')
| -rw-r--r-- | winsup/mingw/include/wchar.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h index 6ff5b44cf1c..4d6dfc8b78a 100644 --- a/winsup/mingw/include/wchar.h +++ b/winsup/mingw/include/wchar.h @@ -152,7 +152,7 @@ __END_CGLOBAL_NAMESPACE #ifndef _WSTRING_DEFINED /* * Unicode versions of the standard calls. - * Also in stdio.h, since MSDN puts them in both headers well */ + * Also in string.h, since MSDN puts them in both headers. */ __BEGIN_CSTD_NAMESPACE wchar_t* wcscat (wchar_t*, const wchar_t*); @@ -219,6 +219,7 @@ __END_CGLOBAL_NAMESPACE #endif /* _WSTRING_DEFINED */ #ifndef __STRICT_ANSI__ +#include <sys/types.h> __BEGIN_CGLOBAL_NAMESPACE /* * non_ANSI wide char functions from io.h, direct.h, sys/stat.h @@ -401,13 +402,17 @@ __END_CSTD_NAMESPACE #define _WSTDLIB_DEFINED #endif +#ifndef __STRICT_ANSI__ +typedef wchar_t _Wint_t; /* Used only by MSVC C++ headers? */ +#endif + __BEGIN_CSTD_NAMESPACE +typedef int mbstate_t; + /* These are resolved by -lmsvcp60 */ /* If you don't have msvcp60.dll in your windows system directory, you can easily obtain it with a search from your favorite search engine. */ -typedef int mbstate_t; -typedef wchar_t _Wint_t; wint_t btowc(int); size_t mbrlen(const char *, size_t, mbstate_t *); |