summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/shadow/stdarg.h
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/shadow/stdarg.h')
-rw-r--r--libstdc++-v3/shadow/stdarg.h29
1 files changed, 21 insertions, 8 deletions
diff --git a/libstdc++-v3/shadow/stdarg.h b/libstdc++-v3/shadow/stdarg.h
index 3e906fcd3b6..cb32feca7d6 100644
--- a/libstdc++-v3/shadow/stdarg.h
+++ b/libstdc++-v3/shadow/stdarg.h
@@ -1,6 +1,6 @@
// -*- C++ -*- header wrapper.
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,14 +29,27 @@
#ifndef _INCLUDED_CPP_STDARG_H_
-# undef _SHADOW_NAME
-# define _SHADOW_NAME <cstdarg>
-# include <bits/generic_shadow.h>
-# undef _SHADOW_NAME
-
-# ifndef _IN_C_LEGACY_
- using ::std::va_list;
# define _INCLUDED_CPP_STDARG_H_ 1
+
+#ifdef _IN_C_LEGACY_ /* sub-included by a C header */
+ // get out of the "legacy"
+ } // close extern "C"
+ } // close namespace _C_legacy::
+# undef _IN_C_LEGACY_
+# define _STDARG_NEED_C_LEGACY_
# endif
+# include <cstdarg>
+
+ // Expose global C names, including non-standard ones, but shadow
+ // some names and types with the std:: C++ version.
+ using std::va_list;
+
+# ifdef _STDARG_NEED_C_LEGACY_
+ // dive back into the "swamp"
+ namespace _C_legacy {
+ extern "C" {
+# define _IN_C_LEGACY_
+# undef _STDARG_NEED_C_LEGACY_
+# endif /* _STDARG_NEED_C_LEGACY_ */
#endif /* _INCLUDED_CPP_STDARG_H_ */
OpenPOWER on IntegriCloud