summaryrefslogtreecommitdiffstats
path: root/contrib/libstdc++/include/c_std/std_csignal.h
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/libstdc++/include/c_std/std_csignal.h')
-rw-r--r--contrib/libstdc++/include/c_std/std_csignal.h23
1 files changed, 13 insertions, 10 deletions
diff --git a/contrib/libstdc++/include/c_std/std_csignal.h b/contrib/libstdc++/include/c_std/std_csignal.h
index 5734cf6..0ce5e2f 100644
--- a/contrib/libstdc++/include/c_std/std_csignal.h
+++ b/contrib/libstdc++/include/c_std/std_csignal.h
@@ -1,6 +1,6 @@
// -*- C++ -*- forwarding header.
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -16,7 +16,7 @@
// 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,
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// As a special exception, you may use this file as part of a free software
@@ -28,34 +28,37 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-//
-// ISO C++ 14882: 20.4.6 C library
-//
-
/** @file csignal
* This is a Standard C++ Library file. You should @c #include this file
* in your programs, rather than any of the "*.h" implementation files.
*
* This is the C++ version of the Standard C Library header @c signal.h,
* and its contents are (mostly) the same as that header, but are all
- * contained in the namespace @c std.
+ * contained in the namespace @c std (except for names which are defined
+ * as macros in C).
*/
+//
+// ISO C++ 14882: 20.4.6 C library
+//
+
#ifndef _GLIBCXX_CSIGNAL
#define _GLIBCXX_CSIGNAL 1
#pragma GCC system_header
+#include <bits/c++config.h>
#include <signal.h>
// Get rid of those macros defined in <signal.h> in lieu of real functions.
#undef raise
-namespace std
-{
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
using ::sig_atomic_t;
using ::signal;
using ::raise;
-}
+
+_GLIBCXX_END_NAMESPACE
#endif
OpenPOWER on IntegriCloud