diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-03-31 22:36:41 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-03-31 22:36:41 +0000 |
| commit | 8436a9b9e314e1cfd686925329d2d8129e9762a4 (patch) | |
| tree | 1ea95c5ace81c26f46a5d84dcd1758db64919402 | |
| parent | 3617c9fefa934c94a5c048b0935def8d8fc2abd3 (diff) | |
| download | gdb-8436a9b9e314e1cfd686925329d2d8129e9762a4.tar.gz | |
* include/stdarg.h: Get rid of namespaces.
| -rw-r--r-- | winsup/mingw/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/mingw/include/stdarg.h | 38 |
2 files changed, 7 insertions, 35 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 3528cc45b50..34a7e8f6ebf 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,5 +1,9 @@ 2003-04-01 Danny Smith <dannysmith@users.sourceforge.net> + * include/stdarg.h: Get rid of namespaces. + +2003-04-01 Danny Smith <dannysmith@users.sourceforge.net> + Merge from mingw trunk (changes since 2003-01-27). 2003-04-01 Danny Smith <dannysmith@users.sourceforge.net> diff --git a/winsup/mingw/include/stdarg.h b/winsup/mingw/include/stdarg.h index a373fb80957..68785860f5c 100644 --- a/winsup/mingw/include/stdarg.h +++ b/winsup/mingw/include/stdarg.h @@ -1,40 +1,8 @@ -/* - * stdarg.h - * Forwarding header to get gcc's stdarg.h and keep std namespace clean +/* + * This is just an RC_INVOKED guard for the real stdarg.h + * included in gcc system dir. One day we will delete this file. */ #ifndef RC_INVOKED - -#include <_mingw.h> - -#ifdef __cplusplus - -namespace __ginclude -{ - /* Include gcc's stdarg.h. */ -# include_next<stdarg.h> -} - -/* If invocation was from the user program, push va_list into std. */ -#if defined (_STDARG_H) - -__BEGIN_CSTD_NAMESPACE - using __ginclude::va_list; -__END_CSTD_NAMESPACE - -/* Otherwise inject __gnuc_va_list into global. */ - -#else - -using __ginclude::__gnuc_va_list; - -#endif /* _STDARG_H */ - -#else /* __cplusplus */ - -/* Just include gcc's stdarg.h. */ #include_next<stdarg.h> - -#endif - #endif /* RC_INVOKED */ |