diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-09-27 01:55:05 +0400 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-09-27 01:55:05 +0400 |
| commit | 2eeb19a1a42a9dafae04f6c8ce398321d8cdb48e (patch) | |
| tree | 7a4de5b2da186ab21cfb24a03ccd34eb8abaf525 | |
| parent | 333ebdb9384b02f1435bf7dac2df655c9d45b7e4 (diff) | |
* 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.
| -rw-r--r-- | winsup/mingw/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/mingw/include/wchar.h | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 998832f3b..f2a662816 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,6 +1,13 @@ 2002-09-27 Danny Smith <dannysmith@users.sourceforge.net> - * include/settjmp.h: Use C++ c-header compatibility defines. + * 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. + +2002-09-27 Danny Smith <dannysmith@users.sourceforge.net> + + * include/setjmp.h: Use C++ c-header compatibility defines. * include/time.h; Don't include non-ISO sys/types.h. (struct tm): Define in __CSTD, if not already done. (_wasctime): Qualify tm with __CSTD. diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h index 6ff5b44cf..4d6dfc8b7 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 *); |