[multiple changes]

2000-05-17  Nathan C. Myers  <ncm@cantrip.org>

	* bits/std_cmath.h: fix sqrt(float)

2000-05-16  Loren J. Rittle  <ljrittle@acm.org>

        * bits/std_cassert.h: Use system_header pragma.
        * bits/std_cctype.h: Likewise.
        * bits/std_cerrno.h: Likewise.
        * bits/std_cfloat.h: Likewise.
        * bits/std_climits.h: Likewise.
        * bits/std_clocale.h: Likewise.
        * bits/std_cmath.h: Likewise.
        * bits/std_csetjmp.h: Likewise.
        * bits/std_csignal.h: Likewise.
        * bits/std_cstdarg.h: Likewise.
        * bits/std_cstddef.h: Likewise.
        * bits/std_cstdio.h: Likewise.
        * bits/std_cstdlib.h: Likewise.
        * bits/std_cstring.h: Likewise.
        * bits/std_ctime.h: Likewise.
        * bits/std_cwchar.h: Likewise.
        * bits/std_cwctype.h: Likewise.
        * bits/std_exception.h: Likewise.
        * bits/std_new.h: Likewise.
        * bits/std_typeinfo.h: Likewise.
        * shadow/bits/std_cassert.h: Likewise.
        * shadow/bits/std_cctype.h: Likewise.
        * shadow/bits/std_cerrno.h: Likewise.
        * shadow/bits/std_cfloat.h: Likewise.
        * shadow/bits/std_climits.h: Likewise.
        * shadow/bits/std_clocale.h: Likewise.
        * shadow/bits/std_cmath.h: Likewise.
        * shadow/bits/std_csetjmp.h: Likewise.
        * shadow/bits/std_csignal.h: Likewise.
        * shadow/bits/std_cstdarg.h: Likewise.
        * shadow/bits/std_cstddef.h: Likewise.
        * shadow/bits/std_cstdio.h: Likewise.
        * shadow/bits/std_cstdlib.h: Likewise.
        * shadow/bits/std_cstring.h: Likewise.
        * shadow/bits/std_ctime.h: Likewise.
        * shadow/bits/std_cwchar.h: Likewise.
        * shadow/bits/std_cwctype.h: Likewise.
        * shadow/bits/wrap_libio.h: Likewise.
        * shadow/bits/wrap_unistd.h: Likewise.
        * shadow/sys/cdefs.h: Likewise.

2000-05-16  Nathan C. Myers  <ncm@cantrip.org>

        It appears that gcc-2.96 supports the keyword "and" now.
	* bits/std_ciso646.h: remove.
	* std/ciso646: gut.
	* testsuite/17_intro/header_ciso646.c: enable testing.
	* src/Makefile.am, src/Makefile.in: remove mention of
	bits/std_ciso646.h

From-SVN: r33967

48 files changed, 111 insertions, 12 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a956c86..a151cc9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,59 @@
+2000-05-17  Nathan C. Myers  <ncm@cantrip.org>
+
+	* bits/std_cmath.h: fix sqrt(float)
+
+2000-05-16  Loren J. Rittle  <ljrittle@acm.org>
+
+        * bits/std_cassert.h: Use system_header pragma.
+        * bits/std_cctype.h: Likewise.
+        * bits/std_cerrno.h: Likewise.
+        * bits/std_cfloat.h: Likewise.
+        * bits/std_climits.h: Likewise.
+        * bits/std_clocale.h: Likewise.
+        * bits/std_cmath.h: Likewise.
+        * bits/std_csetjmp.h: Likewise.
+        * bits/std_csignal.h: Likewise.
+        * bits/std_cstdarg.h: Likewise.
+        * bits/std_cstddef.h: Likewise.
+        * bits/std_cstdio.h: Likewise.
+        * bits/std_cstdlib.h: Likewise.
+        * bits/std_cstring.h: Likewise.
+        * bits/std_ctime.h: Likewise.
+        * bits/std_cwchar.h: Likewise.
+        * bits/std_cwctype.h: Likewise.
+        * bits/std_exception.h: Likewise.
+        * bits/std_new.h: Likewise.
+        * bits/std_typeinfo.h: Likewise.
+        * shadow/bits/std_cassert.h: Likewise.
+        * shadow/bits/std_cctype.h: Likewise.
+        * shadow/bits/std_cerrno.h: Likewise.
+        * shadow/bits/std_cfloat.h: Likewise.
+        * shadow/bits/std_climits.h: Likewise.
+        * shadow/bits/std_clocale.h: Likewise.
+        * shadow/bits/std_cmath.h: Likewise.
+        * shadow/bits/std_csetjmp.h: Likewise.
+        * shadow/bits/std_csignal.h: Likewise.
+        * shadow/bits/std_cstdarg.h: Likewise.
+        * shadow/bits/std_cstddef.h: Likewise.
+        * shadow/bits/std_cstdio.h: Likewise.
+        * shadow/bits/std_cstdlib.h: Likewise.
+        * shadow/bits/std_cstring.h: Likewise.
+        * shadow/bits/std_ctime.h: Likewise.
+        * shadow/bits/std_cwchar.h: Likewise.
+        * shadow/bits/std_cwctype.h: Likewise.
+        * shadow/bits/wrap_libio.h: Likewise.
+        * shadow/bits/wrap_unistd.h: Likewise.
+        * shadow/sys/cdefs.h: Likewise.
+
+2000-05-16  Nathan C. Myers  <ncm@cantrip.org>
+
+        It appears that gcc-2.96 supports the keyword "and" now.
+	* bits/std_ciso646.h: remove.
+	* std/ciso646: gut.
+	* testsuite/17_intro/header_ciso646.c: enable testing.
+	* src/Makefile.am, src/Makefile.in: remove mention of
+	bits/std_ciso646.h
+
 2000-05-16  Nathan C. Myers  <ncm@cantrip.org>
        
        * mkcshadow: fix typo s/_C_Swamp_/_C_Swamp/.
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index f51495c..a8f1bb9 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -90,6 +90,7 @@ OBJDUMP = @OBJDUMP@
 OPTLEVEL = @OPTLEVEL@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+SHADOW_INCLUDES = @SHADOW_INCLUDES@
 THREADDEPS = @THREADDEPS@
 THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
diff --git a/libstdc++-v3/bits/std_cassert.h b/libstdc++-v3/bits/std_cassert.h
index c1aefa6..1b99dd1 100644
--- a/libstdc++-v3/bits/std_cassert.h
+++ b/libstdc++-v3/bits/std_cassert.h
@@ -35,4 +35,5 @@
 
 // No include guards on this header...
 
+# pragma system_header
 # include_next <assert.h>
diff --git a/libstdc++-v3/bits/std_cctype.h b/libstdc++-v3/bits/std_cctype.h
index 4e106c5..57377a4 100644
--- a/libstdc++-v3/bits/std_cctype.h
+++ b/libstdc++-v3/bits/std_cctype.h
@@ -39,6 +39,7 @@
 #define __NO_CTYPE 1
 #endif
 
+# pragma system_header
 # include_next <ctype.h>
 
 // Sequester the C non-inline implementations in the _C_Swamp::
diff --git a/libstdc++-v3/bits/std_cerrno.h b/libstdc++-v3/bits/std_cerrno.h
index fda202d..328bdb2 100644
--- a/libstdc++-v3/bits/std_cerrno.h
+++ b/libstdc++-v3/bits/std_cerrno.h
@@ -35,5 +35,6 @@
 
 #ifndef _CPP_CERRNO
 #define _CPP_CERRNO 1
+# pragma system_header
 # include_next <errno.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cfloat.h b/libstdc++-v3/bits/std_cfloat.h
index 869c452..0fc561f 100644
--- a/libstdc++-v3/bits/std_cfloat.h
+++ b/libstdc++-v3/bits/std_cfloat.h
@@ -35,6 +35,7 @@
 
 #ifndef _CPP_CFLOAT
 #define _CPP_CFLOAT 1
+# pragma system_header
 # include_next <float.h>
 
 #if 0
diff --git a/libstdc++-v3/bits/std_climits.h b/libstdc++-v3/bits/std_climits.h
index 0638ec2..8de7759 100644
--- a/libstdc++-v3/bits/std_climits.h
+++ b/libstdc++-v3/bits/std_climits.h
@@ -1,6 +1,6 @@
 // -*- C++ -*- forwarding header.
 
-// 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
@@ -31,9 +31,12 @@
 // ISO C++ 14882: 18.2.2  Implementation properties: C library
 //
 
-// Note: this is not a conforming implementation.
+// Note: This is not a conforming implementation.
 
 #ifndef _CPP_CLIMITS
 #define _CPP_CLIMITS	1
+# pragma system_header
 # include_next <limits.h>
 #endif
+
+
diff --git a/libstdc++-v3/bits/std_clocale.h b/libstdc++-v3/bits/std_clocale.h
index acadfd7..0f0be82 100644
--- a/libstdc++-v3/bits/std_clocale.h
+++ b/libstdc++-v3/bits/std_clocale.h
@@ -35,6 +35,7 @@
 
 #ifndef _CPP_CLOCALE
 #define _CPP_CLOCALE     1
+# pragma system_header
 # include_next <locale.h>
 #endif
 
diff --git a/libstdc++-v3/bits/std_cmath.h b/libstdc++-v3/bits/std_cmath.h
index 3b53bb1..39f6c86 100644
--- a/libstdc++-v3/bits/std_cmath.h
+++ b/libstdc++-v3/bits/std_cmath.h
@@ -35,6 +35,7 @@
 
 #ifndef _CPP_CMATH
 #define _CPP_CMATH 1
+# pragma system_header
 # include_next <math.h>
 # include_next <stdlib.h>
 
@@ -233,7 +234,7 @@ namespace std {
   sqrt(float __x) { return ::sqrtf(__x); }
 #else
   inline float
-  sqrt(float __x) { return ::fabs(static_cast<double>(__x)); }
+  sqrt(float __x) { return ::sqrt(static_cast<double>(__x)); }
 #endif
 
   // XXX long double
diff --git a/libstdc++-v3/bits/std_csetjmp.h b/libstdc++-v3/bits/std_csetjmp.h
index e94488b..d35fc01 100644
--- a/libstdc++-v3/bits/std_csetjmp.h
+++ b/libstdc++-v3/bits/std_csetjmp.h
@@ -35,5 +35,6 @@
 
 #ifndef _CPP_CSETJMP
 #define _CPP_CSETJMP 1
+# pragma system_header
 # include_next <setjmp.h>
 #endif
diff --git a/libstdc++-v3/bits/std_csignal.h b/libstdc++-v3/bits/std_csignal.h
index b300f5b..ad10e1b 100644
--- a/libstdc++-v3/bits/std_csignal.h
+++ b/libstdc++-v3/bits/std_csignal.h
@@ -35,5 +35,6 @@
 
 #ifndef _CPP_CSIGNAL
 #define _CPP_CSIGNAL 1
+# pragma system_header
 # include_next <signal.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cstdarg.h b/libstdc++-v3/bits/std_cstdarg.h
index 5b0ca7d..48fddf8 100644
--- a/libstdc++-v3/bits/std_cstdarg.h
+++ b/libstdc++-v3/bits/std_cstdarg.h
@@ -35,5 +35,6 @@
 
 #ifndef _CPP_CSTDARG
 #define _CPP_CSTDARG 1
+# pragma system_header
 # include_next <stdarg.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cstddef.h b/libstdc++-v3/bits/std_cstddef.h
index 66a1b5d..46f2518 100644
--- a/libstdc++-v3/bits/std_cstddef.h
+++ b/libstdc++-v3/bits/std_cstddef.h
@@ -35,5 +35,6 @@
 
 #ifndef _CPP_CSTDDEF
 #define _CPP_CSTDDEF 1
+# pragma system_header
 # include_next <stddef.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cstdio.h b/libstdc++-v3/bits/std_cstdio.h
index aec526d..567a96a 100644
--- a/libstdc++-v3/bits/std_cstdio.h
+++ b/libstdc++-v3/bits/std_cstdio.h
@@ -35,6 +35,7 @@
 
 #ifndef _CPP_CSTDIO
 #define _CPP_CSTDIO 1
+# pragma system_header
 # include_next <stdio.h>
 
 #ifndef SEEK_CUR
diff --git a/libstdc++-v3/bits/std_cstdlib.h b/libstdc++-v3/bits/std_cstdlib.h
index adbefa2..c8420e0 100644
--- a/libstdc++-v3/bits/std_cstdlib.h
+++ b/libstdc++-v3/bits/std_cstdlib.h
@@ -41,6 +41,7 @@
 #define __USE_ISOC9X 1
 #endif
 
+# pragma system_header
 # include_next <stdlib.h>
 
 #endif // _CPP_CSTDLIB
diff --git a/libstdc++-v3/bits/std_cstring.h b/libstdc++-v3/bits/std_cstring.h
index c076b6a..3393de0 100644
--- a/libstdc++-v3/bits/std_cstring.h
+++ b/libstdc++-v3/bits/std_cstring.h
@@ -39,5 +39,6 @@
 // We must not see the optimized string functions GNU libc defines.
 #  define __NO_STRING_INLINES
 # endif
+# pragma system_header
 # include_next <string.h>
 #endif
diff --git a/libstdc++-v3/bits/std_ctime.h b/libstdc++-v3/bits/std_ctime.h
index 08c07b6..bce2d91 100644
--- a/libstdc++-v3/bits/std_ctime.h
+++ b/libstdc++-v3/bits/std_ctime.h
@@ -35,5 +35,6 @@
 
 #ifndef _CPP_CTIME
 #define _CPP_CTIME 1
+# pragma system_header
 # include_next <time.h>
 #endif
diff --git a/libstdc++-v3/bits/std_cwchar.h b/libstdc++-v3/bits/std_cwchar.h
index 8c606dc..8e5c117 100644
--- a/libstdc++-v3/bits/std_cwchar.h
+++ b/libstdc++-v3/bits/std_cwchar.h
@@ -38,6 +38,7 @@
 
 #include <bits/c++config.h>
 #ifdef _GLIBCPP_USE_WCHAR_T
+ # pragma system_header
  # include_next <wchar.h>
 #endif 
 
diff --git a/libstdc++-v3/bits/std_cwctype.h b/libstdc++-v3/bits/std_cwctype.h
index 97db4b8..3607de9 100644
--- a/libstdc++-v3/bits/std_cwctype.h
+++ b/libstdc++-v3/bits/std_cwctype.h
@@ -39,6 +39,7 @@
 #define __NO_WCTYPE 1
 #endif
 
+# pragma system_header
 # include_next <wctype.h>
 
 // Sequester the C non-inline implementations in the _C_Swamp::
diff --git a/libstdc++-v3/bits/std_exception.h b/libstdc++-v3/bits/std_exception.h
index 66cf46d..4e8ea11 100644
--- a/libstdc++-v3/bits/std_exception.h
+++ b/libstdc++-v3/bits/std_exception.h
@@ -30,6 +30,7 @@
 #define _CPP_EXCEPTION 1
 
 #ifdef __GNUG__
+#pragma system_header
 #include_next <exception>
 #else
 
diff --git a/libstdc++-v3/bits/std_new.h b/libstdc++-v3/bits/std_new.h
index 1ac2dd0..ec500e6 100644
--- a/libstdc++-v3/bits/std_new.h
+++ b/libstdc++-v3/bits/std_new.h
@@ -32,6 +32,7 @@
 #include <bits/c++config.h>
 
 #ifdef __GNUG__
+# pragma system_header
 # include_next <new>
 #else
 
diff --git a/libstdc++-v3/bits/std_typeinfo.h b/libstdc++-v3/bits/std_typeinfo.h
index 1bce795..6c1655e 100644
--- a/libstdc++-v3/bits/std_typeinfo.h
+++ b/libstdc++-v3/bits/std_typeinfo.h
@@ -34,6 +34,7 @@
 #include <bits/std_exception.h>
 
 #ifdef __GNUG__
+# pragma system_header
 # include_next <typeinfo>
 #else
 
diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in
index a5fd42e..33ac4de 100644
--- a/libstdc++-v3/libio/Makefile.in
+++ b/libstdc++-v3/libio/Makefile.in
@@ -90,6 +90,7 @@ OBJDUMP = @OBJDUMP@
 OPTLEVEL = @OPTLEVEL@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+SHADOW_INCLUDES = @SHADOW_INCLUDES@
 THREADDEPS = @THREADDEPS@
 THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
diff --git a/libstdc++-v3/math/Makefile.in b/libstdc++-v3/math/Makefile.in
index 9683177..926aa21 100644
--- a/libstdc++-v3/math/Makefile.in
+++ b/libstdc++-v3/math/Makefile.in
@@ -90,6 +90,7 @@ OBJDUMP = @OBJDUMP@
 OPTLEVEL = @OPTLEVEL@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+SHADOW_INCLUDES = @SHADOW_INCLUDES@
 THREADDEPS = @THREADDEPS@
 THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
diff --git a/libstdc++-v3/shadow/bits/std_cassert.h b/libstdc++-v3/shadow/bits/std_cassert.h
index cd7c939..b20c45f 100644
--- a/libstdc++-v3/shadow/bits/std_cassert.h
+++ b/libstdc++-v3/shadow/bits/std_cassert.h
@@ -37,6 +37,7 @@
 //   defines a global used in other headers, we are sunk.
 
 extern "C" {
+# pragma system_header
 # include_next <assert.h>
 }
 
diff --git a/libstdc++-v3/shadow/bits/std_cctype.h b/libstdc++-v3/shadow/bits/std_cctype.h
index b8555c1..f20a4d6 100644
--- a/libstdc++-v3/shadow/bits/std_cctype.h
+++ b/libstdc++-v3/shadow/bits/std_cctype.h
@@ -36,6 +36,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <ctype.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_cerrno.h b/libstdc++-v3/shadow/bits/std_cerrno.h
index 0ca6b6c..461a41e 100644
--- a/libstdc++-v3/shadow/bits/std_cerrno.h
+++ b/libstdc++-v3/shadow/bits/std_cerrno.h
@@ -37,6 +37,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <errno.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_cfloat.h b/libstdc++-v3/shadow/bits/std_cfloat.h
index 2b8dbdf..c6dded2 100644
--- a/libstdc++-v3/shadow/bits/std_cfloat.h
+++ b/libstdc++-v3/shadow/bits/std_cfloat.h
@@ -44,6 +44,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <float.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_climits.h b/libstdc++-v3/shadow/bits/std_climits.h
index d1159df..d64bc7d 100644
--- a/libstdc++-v3/shadow/bits/std_climits.h
+++ b/libstdc++-v3/shadow/bits/std_climits.h
@@ -37,6 +37,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <limits.h>
     }
     namespace _C_Shadow { }
diff --git a/libstdc++-v3/shadow/bits/std_clocale.h b/libstdc++-v3/shadow/bits/std_clocale.h
index 85add2d..c62b880 100644
--- a/libstdc++-v3/shadow/bits/std_clocale.h
+++ b/libstdc++-v3/shadow/bits/std_clocale.h
@@ -39,6 +39,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <locale.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_cmath.h b/libstdc++-v3/shadow/bits/std_cmath.h
index a6f97b9..a2b509f 100644
--- a/libstdc++-v3/shadow/bits/std_cmath.h
+++ b/libstdc++-v3/shadow/bits/std_cmath.h
@@ -37,6 +37,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <math.h>
     }
     inline double _CPP_HUGE_VAL_capture()        { return HUGE_VAL; }
diff --git a/libstdc++-v3/shadow/bits/std_csetjmp.h b/libstdc++-v3/shadow/bits/std_csetjmp.h
index 5313887..e4a218c 100644
--- a/libstdc++-v3/shadow/bits/std_csetjmp.h
+++ b/libstdc++-v3/shadow/bits/std_csetjmp.h
@@ -37,6 +37,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <setjmp.h>
     }
     typedef jmp_buf   _CPP_jmp_buf_capture;
diff --git a/libstdc++-v3/shadow/bits/std_csignal.h b/libstdc++-v3/shadow/bits/std_csignal.h
index 36f3cb7..4ebd53f 100644
--- a/libstdc++-v3/shadow/bits/std_csignal.h
+++ b/libstdc++-v3/shadow/bits/std_csignal.h
@@ -37,6 +37,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <signal.h>
       typedef void (*_CPP_CSIGFUN_capture)(int);  // a C function pointer
       typedef sig_atomic_t _CPP_sig_atomic_t_capture; 
diff --git a/libstdc++-v3/shadow/bits/std_cstdarg.h b/libstdc++-v3/shadow/bits/std_cstdarg.h
index 29aee63..caf9608 100644
--- a/libstdc++-v3/shadow/bits/std_cstdarg.h
+++ b/libstdc++-v3/shadow/bits/std_cstdarg.h
@@ -37,6 +37,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <stdarg.h>
     }
     typedef va_list   _CPP_va_list_capture;
diff --git a/libstdc++-v3/shadow/bits/std_cstddef.h b/libstdc++-v3/shadow/bits/std_cstddef.h
index 9ea0b6cc..b850429 100644
--- a/libstdc++-v3/shadow/bits/std_cstddef.h
+++ b/libstdc++-v3/shadow/bits/std_cstddef.h
@@ -37,6 +37,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <stddef.h>
     }
     typedef ptrdiff_t _CPP_ptrdiff_t_capture; 
diff --git a/libstdc++-v3/shadow/bits/std_cstdio.h b/libstdc++-v3/shadow/bits/std_cstdio.h
index 44e1633..31c406c 100644
--- a/libstdc++-v3/shadow/bits/std_cstdio.h
+++ b/libstdc++-v3/shadow/bits/std_cstdio.h
@@ -47,6 +47,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <stdio.h>
     }
     // size_t handled in <cstddef>
diff --git a/libstdc++-v3/shadow/bits/std_cstdlib.h b/libstdc++-v3/shadow/bits/std_cstdlib.h
index 3427cd8..0c0ca17 100644
--- a/libstdc++-v3/shadow/bits/std_cstdlib.h
+++ b/libstdc++-v3/shadow/bits/std_cstdlib.h
@@ -43,6 +43,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <stdlib.h>
       typedef int (*_C_cmp_fun_ptr)(const void*, const void*);  // C fn ptr
     }
diff --git a/libstdc++-v3/shadow/bits/std_cstring.h b/libstdc++-v3/shadow/bits/std_cstring.h
index 258082b..cf52660 100644
--- a/libstdc++-v3/shadow/bits/std_cstring.h
+++ b/libstdc++-v3/shadow/bits/std_cstring.h
@@ -43,6 +43,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <string.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/std_ctime.h b/libstdc++-v3/shadow/bits/std_ctime.h
index 4caba88..e6febaf 100644
--- a/libstdc++-v3/shadow/bits/std_ctime.h
+++ b/libstdc++-v3/shadow/bits/std_ctime.h
@@ -39,6 +39,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <time.h>
     }
     inline clock_t _CPP_CLOCKS_PER_SEC_capture() 
diff --git a/libstdc++-v3/shadow/bits/std_cwchar.h b/libstdc++-v3/shadow/bits/std_cwchar.h
index bd1ec65..62faabc 100644
--- a/libstdc++-v3/shadow/bits/std_cwchar.h
+++ b/libstdc++-v3/shadow/bits/std_cwchar.h
@@ -43,6 +43,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <wchar.h>
     }
     // NULL, size_t handled in <cstddef>
diff --git a/libstdc++-v3/shadow/bits/std_cwctype.h b/libstdc++-v3/shadow/bits/std_cwctype.h
index e3b1a29..2eb1842 100644
--- a/libstdc++-v3/shadow/bits/std_cwctype.h
+++ b/libstdc++-v3/shadow/bits/std_cwctype.h
@@ -41,6 +41,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <wctype.h>
     }
     typedef wctype_t _CPP_wctype_t_capture;
diff --git a/libstdc++-v3/shadow/bits/wrap_libio.h b/libstdc++-v3/shadow/bits/wrap_libio.h
index 3632043..04a0ffc 100644
--- a/libstdc++-v3/shadow/bits/wrap_libio.h
+++ b/libstdc++-v3/shadow/bits/wrap_libio.h
@@ -39,6 +39,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <libio.h>
     }
 
diff --git a/libstdc++-v3/shadow/bits/wrap_unistd.h b/libstdc++-v3/shadow/bits/wrap_unistd.h
index 109a610..77199b1 100644
--- a/libstdc++-v3/shadow/bits/wrap_unistd.h
+++ b/libstdc++-v3/shadow/bits/wrap_unistd.h
@@ -39,6 +39,7 @@
   namespace _C_Swamp {
     extern "C" {
 #     define _IN_C_SWAMP_
+#     pragma system_header
 #     include_next <unistd.h>
     }
 
diff --git a/libstdc++-v3/shadow/sys/cdefs.h b/libstdc++-v3/shadow/sys/cdefs.h
index ebcad9a..32e3255 100644
--- a/libstdc++-v3/shadow/sys/cdefs.h
+++ b/libstdc++-v3/shadow/sys/cdefs.h
@@ -31,6 +31,7 @@
 #ifndef _CPP_SYS_CDEFS_H
 # define _CPP_SYS_CDEFS_H
 
+# pragma system_header
 # include_next <sys/cdefs.h>
 
 // glibc-2 hackery.  Other systems likely require other hacks.
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 6550c36..3d53244 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -83,7 +83,7 @@ headers = \
 	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \
 	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \
 	bits/gslice.h bits/gslice_array.h bits/indirect_array.h \
-	bits/std_cassert.h bits/std_cwctype.h bits/std_ciso646.h \
+	bits/std_cassert.h bits/std_cwctype.h \
 	bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h \
 	bits/std_clocale.h bits/std_cmath.h \
 	bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h \
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 5a472f5..5b6c30d 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -89,6 +89,7 @@ OBJDUMP = @OBJDUMP@
 OPTLEVEL = @OPTLEVEL@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+SHADOW_INCLUDES = @SHADOW_INCLUDES@
 THREADDEPS = @THREADDEPS@
 THREADINCS = @THREADINCS@
 THREADLIBS = @THREADLIBS@
@@ -165,7 +166,7 @@ headers = \
 	bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \
 	bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \
 	bits/gslice.h bits/gslice_array.h bits/indirect_array.h \
-	bits/std_cassert.h bits/std_cwctype.h bits/std_ciso646.h \
+	bits/std_cassert.h bits/std_cwctype.h \
 	bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h \
 	bits/std_clocale.h bits/std_cmath.h \
 	bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h \
diff --git a/libstdc++-v3/std/ciso646 b/libstdc++-v3/std/ciso646
index 1886767..e69de29 100644
--- a/libstdc++-v3/std/ciso646
+++ b/libstdc++-v3/std/ciso646
@@ -1,3 +0,0 @@
-#ifndef _CPP_ISO646
-#include <bits/std_ciso646.h>
-#endif
diff --git a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
index 6677db7..c6c1e39 100644
--- a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc
@@ -100,15 +100,11 @@ bool test02()
   int  int1 = 45;
   int  int2 = 0;
   
-#if 0
-  // XXX g++ doesn't like this. Recognizes the keyword, but can't
-  // parse what's next.
   test &= arg1 && int1;
   test &= arg1 and int1;
 
   test &= (arg1 && arg2) == (arg1 and arg2);
   test &= (arg1 && int1) == (arg1 and int1);
-#endif
 
 #ifdef DEBUG_ASSERT
   assert(test);
@@ -129,3 +125,7 @@ int main(void)
 
 
 
+
+
+
+