From 1792c91ce6609556a835b413d34bbc25932f07e0 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 4 Oct 2000 03:09:19 +0000 Subject: [PATCH] Self-compile with shadow headers. 2000-10-02 Benjamin Kosnik Self-compile with shadow headers. * acconfig.h (_GLIBCPP_USE_SHADOW_HEADERS): Define. Eventually, like _GLIBCPP_USE_NAMESPACES before it, this macro will die when it becomes the default way the library is built. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): New macro. * config/gnu-linux/bits/ctype_base.h (ctype_base): Use it. * config/gnu-linux/ctype.cc (ctype): Use it. * src/localename.cc (locale::_Impl::_M_replace_categories): Remove call to assert. * src/locale.cc: Explicitly cast mbstate_t to void* in calls to memset. This should not be necessary, but an ambiguous overload with it in. * shadow/bits/std_cwchar.h: Fix. * shadow/wchar.h: Fix. * config/gnu-linux/bits/ctype_base.h (ctype_base): Inject ctype enums into namespace std:: for ctype_base enum. Other OS types will have to do this as well. * config/gnu-linux/ctype.cc (ctype): Inject ctype data into namespace std, in particular __ctype_toupper, __ctype_tolower, __ctype_b. * shadow/iolibio.h: New file. * shadow/bits/wrap_iolibio.h: New file. * shadow/libioP.h: New file. * shadow/bits/wrap_libioP.h: New file. * shadow/bits/wrap_fcntl.h: New file. * shadow/fcntl.h: New file. * shadow/iconv.h: New file. Inject iconv names into the global namespace, unmangled for the moment. * shadow/bits/wrap_iconv.h: New file. * shadow/unistd.h: Remove. Useless. * shadow/bits/wrap_unistd.h: Remove. * src/Makefile.am: Take out machine-ansi.h, add fcntl.h unistd.h. * src/Makefile.in: Regenerate. * config/c_io_libio.h (_IO_codecvt): Change to normal C++ decl. * shadow/libio.h: Fix. * shadow/bits/wrap_libio.h: Fix. * shadow/bits/std_clocale.h: Remove typedef struct construct, which will not compile. * shadow/bits/std_ctime.h: Same. * shadow/pthread.h: New file. Put pthreads types and functions into global scope, which is probably not the correct long-term solution but has to be done at the moment before libio wrappers can even be started. * shadow/bits/wrap_pthread.h: New file. * bits/std_ios.h: Formatting tweak. * shadow/bits/std_cstdio.h: Format. Remove extraneous bits. * acinclude.m4 (GLIBCPP_CHECK_COMPILER_FEATURES): Add -Werror to tests for compiler features. * aclocal.m4: Regenerate. * configure: Regenerate. * config/c_io_libio.cc: Remove fcntl.h include, as SEEK_SET redefined. * libio/libioP.h: Comment out fcntl.h include. * shadow/math.h: Add in float and long declarations, as per ISO C9X. * bits/c++config: Define _ISOC99_SOURCE. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add -fno-builtins to CSHADOWFLAGS, as well as _ISOC99_SOURCE. * aclocal.m4: Regenerate. * configure: Regenerate. * src/Makefile.am (CSHADOW_INCLUDES): Enable, again. (CSHADOW_INCLUDES): Add -I$(top_srcdir)/std before shadow include dir. (CXXCOMPILE): Remove $(DEFS), which searches $(top_srcdir) before std or shadow directories. (LTCXXCOMPILE): Same. (INCLUDES): Add $(top_builddir) before $(top_srcdir). (AC_CXXFLAGS): Add CSHADOWFLAGS. * src/Makefile.in: Regenerate. * src/complex.cc (FCT): Change ::name to name. * src/complexl.cc (FCT): Same. Use _GLIBCPP_USE_LONG_LONG here. * src/complexf.cc (FCT): Same. * src/complexf.cc: Remove FCT define, as things are properly overloaded in the std namespace with the shadow headers. * src/complexl.cc: Same. * src/complex.cc: Same. From-SVN: r36706 --- .../bits/{wrap_unistd.h => wrap_fcntl.h} | 79 ++++++++++------- libstdc++-v3/shadow/bits/wrap_iconv.h | 51 +++++++++++ libstdc++-v3/shadow/bits/wrap_iolibio.h | 50 +++++++++++ libstdc++-v3/shadow/bits/wrap_libioP.h | 50 +++++++++++ .../shadow/{unistd.h => bits/wrap_pthread.h} | 59 ++++++++++--- libstdc++-v3/shadow/fcntl.h | 63 ++++++++++++++ libstdc++-v3/shadow/iconv.h | 66 ++++++++++++++ libstdc++-v3/shadow/iolibio.h | 58 +++++++++++++ libstdc++-v3/shadow/libioP.h | 64 ++++++++++++++ libstdc++-v3/shadow/pthread.h | 86 +++++++++++++++++++ 10 files changed, 585 insertions(+), 41 deletions(-) rename libstdc++-v3/shadow/bits/{wrap_unistd.h => wrap_fcntl.h} (69%) create mode 100644 libstdc++-v3/shadow/bits/wrap_iconv.h create mode 100644 libstdc++-v3/shadow/bits/wrap_iolibio.h create mode 100644 libstdc++-v3/shadow/bits/wrap_libioP.h rename libstdc++-v3/shadow/{unistd.h => bits/wrap_pthread.h} (76%) create mode 100644 libstdc++-v3/shadow/fcntl.h create mode 100644 libstdc++-v3/shadow/iconv.h create mode 100644 libstdc++-v3/shadow/iolibio.h create mode 100644 libstdc++-v3/shadow/libioP.h create mode 100644 libstdc++-v3/shadow/pthread.h diff --git a/libstdc++-v3/shadow/bits/wrap_unistd.h b/libstdc++-v3/shadow/bits/wrap_fcntl.h similarity index 69% rename from libstdc++-v3/shadow/bits/wrap_unistd.h rename to libstdc++-v3/shadow/bits/wrap_fcntl.h index 4ff8f36589f..0bed4bf1d4a 100644 --- a/libstdc++-v3/shadow/bits/wrap_unistd.h +++ b/libstdc++-v3/shadow/bits/wrap_fcntl.h @@ -1,6 +1,6 @@ // -*- C++ -*- header wrapper. -// Copyright (C) 1997-1999 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -28,46 +28,65 @@ // the GNU General Public License. // -// ISO C++ 14882: 20.5 Date and time +// ISO C++ 14882: 26.5 C library extensions // -// XXX incomplete +#ifndef _CPP_FCNTL +#define _CPP_FCNTL 1 -#ifndef _CPP_WRAP_UNISTD_H -#define _CPP_WRAP_UNISTD_H 1 +# include - namespace _C_legacy { - extern "C" { +namespace _C_legacy { + extern "C" { # define _IN_C_LEGACY_ # pragma GCC system_header -# include_next - } + // XXX +# undef SEEK_SET +# undef SEEK_CUR +# undef SEEK_END - namespace _C_shadow { } - } // close namespace ::_C_legacy:: +# include_next + } +} // namespace _C_legacy -// # undef that +# undef SEEK_SET +# undef SEEK_CUR +# undef SEEK_END - namespace _C_legacy { - namespace _C_shadow { - // typedef stuff - } - } - namespace std { - - using ::_C_legacy::read; - using ::_C_legacy::write; - using ::_C_legacy::open; - - } // close namespace std:: - - namespace _C_legacy { - namespace _C_shadow { - // using ::std::stuff - } - } +// NB: Don't bring elements from this non-standard header into namespace std. # undef _IN_C_LEGACY_ #endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libstdc++-v3/shadow/bits/wrap_iconv.h b/libstdc++-v3/shadow/bits/wrap_iconv.h new file mode 100644 index 00000000000..3e72e2d46ee --- /dev/null +++ b/libstdc++-v3/shadow/bits/wrap_iconv.h @@ -0,0 +1,51 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 20.5 Extensions +// + +#ifndef _CPP_WRAP_ICONV_H +#define _CPP_WRAP_ICONV_H 1 + +namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# pragma GCC system_header +# include_next + } +} // namespace _C_legacy + +// NB: Don't bring elements from this non-standard header into namespace std. + +# undef _IN_C_LEGACY_ + +#endif + + diff --git a/libstdc++-v3/shadow/bits/wrap_iolibio.h b/libstdc++-v3/shadow/bits/wrap_iolibio.h new file mode 100644 index 00000000000..ddbabd7a424 --- /dev/null +++ b/libstdc++-v3/shadow/bits/wrap_iolibio.h @@ -0,0 +1,50 @@ +// -*- C++ -*- header wrapper. + +// 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 20.5 Extensions +// + +#ifndef _CPP_WRAP_IOLIBIO_H +#define _CPP_WRAP_IOLIBIO_H 1 + +namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# pragma GCC system_header +# include_next + } +} // namespace _C_legacy + +// NB: Don't bring elements from this non-standard header into namespace std. + +# undef _IN_C_LEGACY_ + +#endif + diff --git a/libstdc++-v3/shadow/bits/wrap_libioP.h b/libstdc++-v3/shadow/bits/wrap_libioP.h new file mode 100644 index 00000000000..32f8c2ebd10 --- /dev/null +++ b/libstdc++-v3/shadow/bits/wrap_libioP.h @@ -0,0 +1,50 @@ +// -*- C++ -*- header wrapper. + +// 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 20.5 Extensions +// + +#ifndef _CPP_WRAP_LIBIOP_H +#define _CPP_WRAP_LIBIOP_H 1 + +namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# pragma GCC system_header +# include_next + } +} // namespace _C_legacy + +// NB: Don't bring elements from this non-standard header into namespace std. + +# undef _IN_C_LEGACY_ + +#endif + diff --git a/libstdc++-v3/shadow/unistd.h b/libstdc++-v3/shadow/bits/wrap_pthread.h similarity index 76% rename from libstdc++-v3/shadow/unistd.h rename to libstdc++-v3/shadow/bits/wrap_pthread.h index f1faf243e8f..d04eeba8a31 100644 --- a/libstdc++-v3/shadow/unistd.h +++ b/libstdc++-v3/shadow/bits/wrap_pthread.h @@ -1,6 +1,6 @@ // -*- C++ -*- header wrapper. -// Copyright (C) 1997-1999 Free Software Foundation, Inc. +// Copyright (C) 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 @@ -26,19 +26,56 @@ // the GNU General Public License. This exception does not however // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. + +// +// ISO C++ 14882: 26.5 C library extensions +// + +#ifndef _CPP_WRAP_PTHREAD_H +#define _CPP_WRAP_PTHREAD_H 1 + +# include + +namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# pragma GCC system_header +# include_next + } +} // namespace _C_legacy + +# undef _IN_C_LEGACY_ + +#endif + + + + + + + + + + + + + + + + + + + + + + + + + + -#ifndef _INCLUDED_CPP_UNISTD_H_ -# undef _SHADOW_NAME -# define _SHADOW_NAME -# include -# undef _SHADOW_NAME -# ifndef _IN_C_LEGACY_ - // using ::std::stuff -# define _INCLUDED_CPP_UNISTD_H_ 1 -# endif -#endif /* _INCLUDED_CPP_UNISTD_H_ */ diff --git a/libstdc++-v3/shadow/fcntl.h b/libstdc++-v3/shadow/fcntl.h new file mode 100644 index 00000000000..f19a1549274 --- /dev/null +++ b/libstdc++-v3/shadow/fcntl.h @@ -0,0 +1,63 @@ +// -*- C++ -*- header wrapper. + +// 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _INCLUDED_CPP_FCNTL_H_ +# define _INCLUDED_CPP_FCNTL_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 _FCNTL_NEED_C_LEGACY_ +# endif + +# include + + // Expose global C names, including non-standard ones, but shadow + // some names and types with the std:: C++ version. + using _C_legacy::flock; + + using _C_legacy::creat; + using _C_legacy::open; + using _C_legacy::fcntl; + +# ifdef _FCNTL_NEED_C_LEGACY_ + // dive back into the "swamp" + namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# undef _FCNTL_NEED_C_LEGACY_ +# endif /* _FCNTL_NEED_C_LEGACY_ */ +#endif /* _INCLUDED_CPP_FCNTL_H_ */ + + + + diff --git a/libstdc++-v3/shadow/iconv.h b/libstdc++-v3/shadow/iconv.h new file mode 100644 index 00000000000..1ea5038c24a --- /dev/null +++ b/libstdc++-v3/shadow/iconv.h @@ -0,0 +1,66 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _INCLUDED_CPP_ICONV_H_ +# define _INCLUDED_CPP_ICONV_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 _ICONV_NEED_C_LEGACY_ +# endif + +# include + + // Expose global C names, including non-standard ones, but shadow + // some names and types with the std:: C++ version. + + // NB: Cannot use typedefs here to inject the names as the "C" headers + // often include typedefs that include the keyword 'struct' + using _C_legacy::iconv_t; + + using _C_legacy::iconv_open; + using _C_legacy::iconv; + using _C_legacy::iconv_close; + +# ifdef _ICONV_NEED_C_LEGACY_ + // dive back into the "swamp" + namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# undef _ICONV_NEED_C_LEGACY_ +# endif /* _ICONV_NEED_C_LEGACY_ */ +#endif /* _INCLUDED_CPP_ICONV_H_ */ + + + + diff --git a/libstdc++-v3/shadow/iolibio.h b/libstdc++-v3/shadow/iolibio.h new file mode 100644 index 00000000000..845f6403594 --- /dev/null +++ b/libstdc++-v3/shadow/iolibio.h @@ -0,0 +1,58 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _INCLUDED_CPP_IOLIBIO_H_ +# define _INCLUDED_CPP_IOLIBIO_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 _IOLIBIO_NEED_C_LEGACY_ +# endif + +# include + + // Expose global C names, including non-standard ones, but shadow + // some names and types with the std:: C++ version. + +# ifdef _IOLIBIO_NEED_C_LEGACY_ + // dive back into the "swamp" + namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# undef _IOLIBIO_NEED_C_LEGACY_ +# endif /* _IOLIBIO_NEED_C_LEGACY_ */ +#endif /* _INCLUDED_CPP_IOLIBIO_H_ */ + + + + diff --git a/libstdc++-v3/shadow/libioP.h b/libstdc++-v3/shadow/libioP.h new file mode 100644 index 00000000000..da3e716768f --- /dev/null +++ b/libstdc++-v3/shadow/libioP.h @@ -0,0 +1,64 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _INCLUDED_CPP_LIBIOP_H_ +# define _INCLUDED_CPP_LIBIOP_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 _LIBIOP_NEED_C_LEGACY_ +# endif + +# include + + // Expose global C names, including non-standard ones, but shadow + // some names and types with the std:: C++ version. + using _C_legacy::_IO_jump_t; + using _C_legacy::_IO_FILE_plus; + using _C_legacy::_IO_cookie_file; + + using _C_legacy::_IO_file_jumps; + using _C_legacy::_IO_wfile_jumps; + +# ifdef _LIBIOP_NEED_C_LEGACY_ + // dive back into the "swamp" + namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# undef _LIBIOP_NEED_C_LEGACY_ +# endif /* _LIBIOP_NEED_C_LEGACY_ */ +#endif /* _INCLUDED_CPP_LIBIOP_H_ */ + + + + diff --git a/libstdc++-v3/shadow/pthread.h b/libstdc++-v3/shadow/pthread.h new file mode 100644 index 00000000000..8692d3e52d4 --- /dev/null +++ b/libstdc++-v3/shadow/pthread.h @@ -0,0 +1,86 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _INCLUDED_CPP_PTHREAD_H_ +# define _INCLUDED_CPP_PTHREAD_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 _PTHREAD_NEED_C_LEGACY_ +# endif + +# include + + // Expose global C names, including non-standard ones, but shadow + // some names and types with the std:: C++ version. + using _C_legacy::__sched_param; + + using _C_legacy::pthread_attr_t; + using _C_legacy::pthread_cond_t; + using _C_legacy::pthread_condattr_t; + using _C_legacy::pthread_key_t; + using _C_legacy::pthread_mutex_t; + using _C_legacy::pthread_mutexattr_t; + using _C_legacy::pthread_once_t; + using _C_legacy::pthread_rwlock_t; + using _C_legacy::pthread_rwlockattr_t; + using _C_legacy::pthread_t; + + using _C_legacy::pthread_mutex_init; + using _C_legacy::pthread_mutex_destroy; + using _C_legacy::pthread_mutex_lock; + using _C_legacy::pthread_mutex_trylock; + using _C_legacy::pthread_mutex_unlock; + using _C_legacy::pthread_mutexattr_init; + using _C_legacy::pthread_mutexattr_destroy; + using _C_legacy::pthread_mutexattr_settype; + using _C_legacy::pthread_mutexattr_gettype; + using _C_legacy::pthread_key_create; + using _C_legacy::pthread_key_delete; + using _C_legacy::pthread_setspecific; + using _C_legacy::pthread_getspecific; + using _C_legacy::pthread_once; + using _C_legacy::pthread_atfork; + +# ifdef _PTHREAD_NEED_C_LEGACY_ + // dive back into the "swamp" + namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# undef _PTHREAD_NEED_C_LEGACY_ +# endif /* _PTHREAD_NEED_C_LEGACY_ */ +#endif /* _INCLUDED_CPP_PTHREAD_H_ */ + + + + -- 2.30.2