diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-04-04 05:14:12 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-04-04 05:14:12 +0000 |
| commit | f06ff05ad878f94fea517703bc14194054db39eb (patch) | |
| tree | ec1d44f9756f5a5fb7edcfb060abfb9eb481eb5e | |
| parent | 6213e142782cf194925d35b153d76bbfbb3f94a0 (diff) | |
| download | newlib-f06ff05ad878f94fea517703bc14194054db39eb.zip newlib-f06ff05ad878f94fea517703bc14194054db39eb.tar.gz newlib-f06ff05ad878f94fea517703bc14194054db39eb.tar.bz2 | |
* include/_mingw.h:[__cplusplus] Include <bits/c++config.h>.
(__HAVE_STD_CXX): Rename to __MINGW_USE_MAMESPACES.
Depend on _GLIBCPP_USE_NAMESPACES, not __GNUC__ version.
* include/time.h (_wctime): Qualify time_t with __CSTD.
| -rw-r--r-- | winsup/mingw/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/mingw/include/_mingw.h | 29 | ||||
| -rw-r--r-- | winsup/mingw/include/time.h | 2 |
3 files changed, 25 insertions, 13 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 0f3bd8d..1bf1ff4 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,10 @@ +2003-04-04 Danny Smith <dannysmith@users.sourceforge.net> + + * include/_mingw.h:[__cplusplus] Include <bits/c++config.h>. + (__HAVE_STD_CXX): Rename to __MINGW_USE_NAMESPACES. + Depend on _GLIBCPP_USE_NAMESPACES, not __GNUC__ version. + * include/time.h (_wctime): Qualify time_t with __CSTD. + 2003-04-01 Danny Smith <dannysmith@users.sourceforge.net> * samples/dlltest/expexe.def (NAME): Add. diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h index 9af0044..86932ee 100644 --- a/winsup/mingw/include/_mingw.h +++ b/winsup/mingw/include/_mingw.h @@ -87,22 +87,24 @@ #define __MINGW32_MINOR_VERSION 0 /* ISO C++. */ -#ifndef __HAVE_STD_CXX -#if __GNUC__ >= 3 && __GNUC_MINOR__ >= 3 -#define __HAVE_STD_CXX 1 -#else -#define __HAVE_STD_CXX 0 -#endif -#endif - #ifdef __cplusplus +#include <bits/c++config.h> + +# ifndef __MINGW_USE_NAMESPACES +# if _GLIBCPP_USE_NAMESPACES +# define __MINGW_USE_NAMESPACES 1 +# else +# define __MINGW_USE_NAMESPACES 0 +# endif +# endif + # if !(defined(__BEGIN_CSTD_NAMESPACE) \ && defined(__END_CSTD_NAMESPACE)) -# if __HAVE_STD_CXX +# if __MINGW_USE_NAMESPACES # define __BEGIN_CSTD_NAMESPACE namespace std { extern "C" { # define __END_CSTD_NAMESPACE } } # define __CSTD std:: -# else +# else /* __MINGW_USE_NAMESPACES */ # define __BEGIN_CSTD_NAMESPACE extern "C" { # define __END_CSTD_NAMESPACE } # define __CSTD @@ -114,13 +116,16 @@ # define __END_CGLOBAL_NAMESPACE } # define __CGLOBAL :: # endif /* !defined(__BEGIN_CGLOBAL_NAMESPACE) */ -#else /* !__cplusplus */ + +#else /* __cplusplus */ + # define __BEGIN_CSTD_NAMESPACE # define __END_CSTD_NAMESPACE # define __CSTD # define __BEGIN_CGLOBAL_NAMESPACE # define __END_CGLOBAL_NAMESPACE # define __CGLOBAL -#endif + +#endif /* !__cplusplus */ #endif /* __MINGW_H */ diff --git a/winsup/mingw/include/time.h b/winsup/mingw/include/time.h index 6ec8dd0..581f922 100644 --- a/winsup/mingw/include/time.h +++ b/winsup/mingw/include/time.h @@ -183,7 +183,7 @@ __MINGW_IMPORT char *tzname[2]; /* wide function prototypes, also declared in wchar.h */ _CRTIMP wchar_t* __cdecl _wasctime(const struct tm*); -_CRTIMP wchar_t* __cdecl _wctime(const time_t*); +_CRTIMP wchar_t* __cdecl _wctime(const __CSTD time_t*); _CRTIMP wchar_t* __cdecl _wstrdate(wchar_t*); _CRTIMP wchar_t* __cdecl _wstrtime(wchar_t*); |