diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-12 12:45:58 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-12 12:45:58 +0000 |
| commit | 4db5e966ac07d2ffa16824b78e236e59eb9c175a (patch) | |
| tree | 031a616bb84310ad2d8ded059d0948c11dff81a7 /libstdc++-v3/include/c_std/bits/std_cstddef.h | |
| parent | 969e48bf25e50ac1ceef99c05c0a23292551263f (diff) | |
| download | ppe42-gcc-4db5e966ac07d2ffa16824b78e236e59eb9c175a.tar.gz ppe42-gcc-4db5e966ac07d2ffa16824b78e236e59eb9c175a.zip | |
2000-10-11 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* libsupc++/Makefile.am: Use it.
* libio/Makefile.am: Use it.
* libmath/Makefile.am: Use it.
* src/Makefile.am: Use it.
* Makefile.am (AM_MAKEFLAGS): Remove includes.
* acinclude.m4 (GLIBCPP_EXPORT_INCLUES): Move include macros here.
(GLIBCPP_EXPORT_FLAGS): Move CXX flag setting here.
* configure.in: Use it.
* mkcheck.in (SRC_DIR): Use C_INCLUDE_DIR.
* src/Makefile.am (CXXCOMPILE): Remove.
* src/Makefile.in: Regenerate.
* libsupc++/Makefile.am (CXXCOMPILE): Same here.
* libsupc++/Makefile.in: Regenerate.
* include/c_std/*: Merge with shadow.
* include/c_std/bits/*: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36851 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/c_std/bits/std_cstddef.h')
| -rw-r--r-- | libstdc++-v3/include/c_std/bits/std_cstddef.h | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/libstdc++-v3/include/c_std/bits/std_cstddef.h b/libstdc++-v3/include/c_std/bits/std_cstddef.h index a0c1f2c0194..5ebcb61c808 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstddef.h +++ b/libstdc++-v3/include/c_std/bits/std_cstddef.h @@ -34,28 +34,16 @@ #ifndef _CPP_CSTDDEF #define _CPP_CSTDDEF 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 _STDDEF_NEED_C_LEGACY_ -# endif - namespace _C_legacy { extern "C" { -# define _IN_C_LEGACY_ -# pragma GCC system_header - -//# define __need_ptrdiff_t -//# define __need_size_t -# include_next <stddef.h> +# define _IN_C_LEGACY_ +# pragma GCC system_header +# include_next <stddef.h> } } // namespace _C_legacy # undef ptrdiff_t # undef size_t -# undef wchar_t namespace std { using _C_legacy::ptrdiff_t; @@ -64,25 +52,7 @@ namespace std { # undef _IN_C_LEGACY_ - // Expose global C names, including non-standard ones, but shadow - // some names and types with the std:: C++ version. - using std::ptrdiff_t; - using std::size_t; - - // 3.9.1 Fundamental Types - // p 5 - // wchar_t is a fundamental type - // using std::wchar_t; - -# ifdef _STDDEF_NEED_C_LEGACY_ - // dive back into the "swamp" - namespace _C_legacy { - extern "C" { -# define _IN_C_LEGACY_ -# undef _STDDEF_NEED_C_LEGACY_ -# endif /* _STDDEF_NEED_C_LEGACY_ */ - -#endif /*_CPP_CSTDDEF*/ +#endif |
