std_cerrno.h: Don't define errno in std::.

2001-03-06  Nathan Myers  <ncm@cantrip.org>
	    Benjamin Kosnik  <bkoz@redhat.com>

	* include/c_std/bits/std_cerrno.h: Don't define errno in std::.
	* testsuite/17_intro/header_cerrno.cc (test01): New file.
	* testsuite/17_intro/header_cassert.cc (test01): New file.
	* testsuite/17_intro/header_cstddef.cc (test01): New file.
	* testsuite/17_intro/header_csetjmp.cc (test01): New file.
	* testsuite/17_intro/header_cstdarg.cc (test01): New file.

Co-Authored-By: Benjamin Kosnik <bkoz@redhat.com>

From-SVN: r40270

7 files changed, 224 insertions, 10 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4007fcf..116a974 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-06  Nathan Myers  <ncm@cantrip.org> 
+	    Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/c_std/bits/std_cerrno.h: Don't define errno in std::.
+	* testsuite/17_intro/header_cerrno.cc (test01): New file.
+	* testsuite/17_intro/header_cassert.cc (test01): New file.
+	* testsuite/17_intro/header_cstddef.cc (test01): New file.
+	* testsuite/17_intro/header_csetjmp.cc (test01): New file.	
+	* testsuite/17_intro/header_cstdarg.cc (test01): New file.	
+
 2001-03-05  scott snyder  <snyder@fnal.gov>
 
 	libstdc++/2190
diff --git a/libstdc++-v3/include/c_std/bits/std_cerrno.h b/libstdc++-v3/include/c_std/bits/std_cerrno.h
index 1dc2d13..d4b2b7a 100644
--- a/libstdc++-v3/include/c_std/bits/std_cerrno.h
+++ b/libstdc++-v3/include/c_std/bits/std_cerrno.h
@@ -1,6 +1,6 @@
 // The -*- C++ -*- error number header.
 
-// Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+// Copyright (C) 1997, 1998, 1999, 2001 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
@@ -39,13 +39,4 @@
 #pragma GCC system_header
 #include <errno.h>
 
-namespace std 
-{
-  extern "C" int errno;
-}
-
 #endif
-
-
-
-
diff --git a/libstdc++-v3/testsuite/17_intro/header_cassert.cc b/libstdc++-v3/testsuite/17_intro/header_cassert.cc
new file mode 100644
index 0000000..f232bac
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/header_cassert.cc
@@ -0,0 +1,40 @@
+// 2001-02-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001 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.
+
+// 17.4.1.2 Headers, cassert
+
+#include <cassert>
+
+namespace gnu
+{
+  void test01()
+  { 
+    assert (true);
+#ifndef assert
+    #error "assert_must_be_a_macro"
+#endif
+  }
+}
+  
+int main()
+{
+  gnu::test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/17_intro/header_cerrno.cc b/libstdc++-v3/testsuite/17_intro/header_cerrno.cc
new file mode 100644
index 0000000..bfd869e
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/header_cerrno.cc
@@ -0,0 +1,40 @@
+// 2001-02-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001 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.
+
+// 17.4.1.2 Headers, cerrno
+
+#include <cerrno>
+
+namespace gnu
+{
+  void test01()
+  { 
+    int i = errno;
+#ifndef errno
+    #error "errno_must_be_a_macro"
+#endif
+  }
+}
+  
+int main()
+{
+  gnu::test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/17_intro/header_csetjmp.cc b/libstdc++-v3/testsuite/17_intro/header_csetjmp.cc
new file mode 100644
index 0000000..4e2610d
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/header_csetjmp.cc
@@ -0,0 +1,41 @@
+// 2001-02-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001 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.
+
+// 17.4.1.2 Headers, csetjmp
+
+#include <csetjmp>
+
+namespace gnu
+{
+  void test01()
+  { 
+    std::jmp_buf env;
+    int i = setjmp(env);
+#ifndef setjmp
+    #error "setjmp_must_be_a_macro"
+#endif
+  }
+}
+  
+int main()
+{
+  gnu::test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/17_intro/header_cstdarg.cc b/libstdc++-v3/testsuite/17_intro/header_cstdarg.cc
new file mode 100644
index 0000000..260e929
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/header_cstdarg.cc
@@ -0,0 +1,46 @@
+// 2001-02-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001 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.
+
+// 17.4.1.2 Headers, cstdarg
+
+#include <cstdarg>
+
+namespace gnu
+{
+  void test01()
+  { 
+    std::va_list list;
+#ifndef va_arg
+    #error "va_arg_must_be_a_macro"
+#endif
+#ifndef va_end
+    #error "va_end_must_be_a_macro"
+#endif
+#ifndef va_start
+    #error "va_start_must_be_a_macro"
+#endif
+  }
+}
+  
+int main()
+{
+  gnu::test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/17_intro/header_cstddef.cc b/libstdc++-v3/testsuite/17_intro/header_cstddef.cc
new file mode 100644
index 0000000..eab1c75
--- /dev/null
+++ b/libstdc++-v3/testsuite/17_intro/header_cstddef.cc
@@ -0,0 +1,46 @@
+// 2001-02-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001 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.
+
+// 17.4.1.2 Headers, cstddef
+
+#include <cstddef>
+
+namespace gnu
+{
+  struct test_type
+  {
+    int i;
+    int j;
+  };
+
+  void test01()
+  { 
+    std::size_t i = offsetof(struct test_type, i);
+#ifndef offsetof
+    #error "offsetof_must_be_a_macro"
+#endif
+  }
+}
+  
+int main()
+{
+  gnu::test01();
+  return 0;
+}