c/: Guard with _CPP_.

2002-03-26  Benjamin Kosnik  <bkoz@redhat.com>

	* include/c/: Guard with _CPP_.
	* include/c_std/: Same.
	* include/Makefile.am: Fixup install, link routines for null
	c_base_headers_extra scenarios.
	* include/Makefile.in: Regerate.

From-SVN: r51431

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6a174938b4ec7fac266a1016f2e4fb65b214c593..4f06c2b1fbcfae7be81a93aa9a4252050f1a9a60 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-26  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * include/c/: Guard with _CPP_.
+       * include/c_std/: Same.
+       * include/Makefile.am: Fixup install, link routines for null
+       c_base_headers_extra scenarios.
+       * include/Makefile.in: Regerate.
+       
 2002-03-25  Paolo Carlini <pcarlini@unitus.it>
             Richard Henderson  <rth@redhat.com>
 

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 725d20f0a12cf75fde82a3372934ea5452209fde..545582ab055593efb1b30f5bfdd30b1ea982f56c 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -324,7 +324,7 @@ stamp-bits: ${bits_headers}
        (cd ${bits_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-bits
 
-stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
+stamp-c_base: ${c_base_headers} ${c_base_headers_extra} 
        @if [ ! -d "${c_base_builddir}" ]; then \
          mkdir -p ${c_base_builddir} ;\
        fi ;\
@@ -332,7 +332,9 @@ stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
          official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
          @LN_S@ $$h ./$${official_name} || true ;\
        done) ;\
-       (cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra}  . || true) ;\
+       if [ ! -z "${c_base_headers_extra}" ]; then \
+         (cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra}  . || true) ;\
+       fi ;\
        echo `date` > stamp-c_base
 
 stamp-backward: ${backward_headers}
@@ -434,8 +436,9 @@ install-data-local:
        for file in ${c_base_headers_rename}; do \
          $(INSTALL_DATA) ${c_base_builddir}/$${file} \
            ${gxx_include_dir}/${c_base_builddir}; done
-       for file in ${c_base_headers_extra}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
+       c_base_headers_extra_install=${c_base_headers_extra};\
+       for file in $$c_base_headers_extra_install; do \
+         $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done
        $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
        for file in ${std_headers_rename}; do \
          $(INSTALL_DATA) ${std_builddir}/$${file} \

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 13a4a957d17fcf0f408b811a836f593b6c100e35..f6a0e76619c4af1ae601b42f7a0341ef48a0770b 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -569,7 +569,7 @@ stamp-bits: ${bits_headers}
        (cd ${bits_builddir} && @LN_S@ $? . || true) ;\
        echo `date` > stamp-bits
 
-stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
+stamp-c_base: ${c_base_headers} ${c_base_headers_extra} 
        @if [ ! -d "${c_base_builddir}" ]; then \
          mkdir -p ${c_base_builddir} ;\
        fi ;\
@@ -577,7 +577,9 @@ stamp-c_base: ${c_base_headers} ${c_base_headers_extra}
          official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
          @LN_S@ $$h ./$${official_name} || true ;\
        done) ;\
-       (cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra}  . || true) ;\
+       if [ ! -z "${c_base_headers_extra}" ]; then \
+         (cd ${bits_builddir} && @LN_S@ ${c_base_headers_extra}  . || true) ;\
+       fi ;\
        echo `date` > stamp-c_base
 
 stamp-backward: ${backward_headers}
@@ -665,8 +667,9 @@ install-data-local:
        for file in ${c_base_headers_rename}; do \
          $(INSTALL_DATA) ${c_base_builddir}/$${file} \
            ${gxx_include_dir}/${c_base_builddir}; done
-       for file in ${c_base_headers_extra}; do \
-         $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done
+       c_base_headers_extra_install=${c_base_headers_extra};\
+       for file in $$c_base_headers_extra_install; do \
+         $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done
        $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
        for file in ${std_headers_rename}; do \
          $(INSTALL_DATA) ${std_builddir}/$${file} \

diff --git a/libstdc++-v3/include/c/std_cctype.h b/libstdc++-v3/include/c/std_cctype.h
index 1271e072a694e75d68bd6021564b5a4917cac319..9d84a3d68b72a745966572c6aa4bf4868e243847 100644 (file)
--- a/libstdc++-v3/include/c/std_cctype.h
+++ b/libstdc++-v3/include/c/std_cctype.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: <ccytpe>
 //
 
-#ifndef _CCTYPE
-#define _CCTYPE 1
+#ifndef _CPP_CCTYPE
+#define _CPP_CCTYPE 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cerrno.h b/libstdc++-v3/include/c/std_cerrno.h
index dea3c0e9398757bbc5927e1d9070df2bb1854993..93ba86843899823385fde302850a6a98c665535d 100644 (file)
--- a/libstdc++-v3/include/c/std_cerrno.h
+++ b/libstdc++-v3/include/c/std_cerrno.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 19.3  Error numbers
 //
 
-#ifndef _CERRNO
-#define _CERRNO 1
+#ifndef _CPP_CERRNO
+#define _CPP_CERRNO 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cfloat.h b/libstdc++-v3/include/c/std_cfloat.h
index bcdb5f7bc298cc62f4d7b3b8a2f8ec8bee8e5524..9c95760b38bf2894f8196d7ad6327b5b59488ebc 100644 (file)
--- a/libstdc++-v3/include/c/std_cfloat.h
+++ b/libstdc++-v3/include/c/std_cfloat.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.2.2  Implementation properties: C library
 //
 
-#ifndef _CFLOAT
-#define _CFLOAT 1
+#ifndef _CPP_CFLOAT
+#define _CPP_CFLOAT 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_climits.h b/libstdc++-v3/include/c/std_climits.h
index acfbe9b57bfd4759a6f4d53adc237579cf70e864..9194cb9adf764f393338988dedd4ab9a442af60b 100644 (file)
--- a/libstdc++-v3/include/c/std_climits.h
+++ b/libstdc++-v3/include/c/std_climits.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.2.2  Implementation properties: C library
 //
 
-#ifndef _CLIMITS
-#define _CLIMITS       1
+#ifndef _CPP_CLIMITS
+#define _CPP_CLIMITS   1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_clocale.h b/libstdc++-v3/include/c/std_clocale.h
index 6ac30a77fd7545f9ab7459ffaa2e968c7916ae0d..b6b3c22268ade0623e776088885eeaef9bbfc43e 100644 (file)
--- a/libstdc++-v3/include/c/std_clocale.h
+++ b/libstdc++-v3/include/c/std_clocale.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.2.2  Implementation properties: C library
 //
 
-#ifndef _CLOCALE
-#define _CLOCALE 1
+#ifndef _CPP_CLOCALE
+#define _CPP_CLOCALE 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cmath.h b/libstdc++-v3/include/c/std_cmath.h
index fb53a2dafbfe3c3484eff431beee4486e42a0163..33ac50b9f9ad3710d96cc24232d775fef9de296f 100644 (file)
--- a/libstdc++-v3/include/c/std_cmath.h
+++ b/libstdc++-v3/include/c/std_cmath.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 26.5  C library
 //
 
-#ifndef _CMATH
-#define _CMATH 1
+#ifndef _CPP_CMATH
+#define _CPP_CMATH 1
  
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_csetjmp.h b/libstdc++-v3/include/c/std_csetjmp.h
index 776166084954de71a2dbb53320fb1fe2872db741..011907bbaa14ae19d1c0179620799344f1262921 100644 (file)
--- a/libstdc++-v3/include/c/std_csetjmp.h
+++ b/libstdc++-v3/include/c/std_csetjmp.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CSETJMP
-#define _CSETJMP 1
+#ifndef _CPP_CSETJMP
+#define _CPP_CSETJMP 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_csignal.h b/libstdc++-v3/include/c/std_csignal.h
index 6f2790c5b315dfc9db172c2a69aee4bf24151302..09614e7ea0196cf6ebae26d1a8473ebf6a3fe1b5 100644 (file)
--- a/libstdc++-v3/include/c/std_csignal.h
+++ b/libstdc++-v3/include/c/std_csignal.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CSIGNAL
-#define _CSIGNAL 1
+#ifndef _CPP_CSIGNAL
+#define _CPP_CSIGNAL 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cstdarg.h b/libstdc++-v3/include/c/std_cstdarg.h
index b91c3c00a267986babdf013785b2d958d79bb3d4..d2cb544157973d858e9c94491b3707c01e74a963 100644 (file)
--- a/libstdc++-v3/include/c/std_cstdarg.h
+++ b/libstdc++-v3/include/c/std_cstdarg.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CSTDARG
-#define _CSTDARG 1
+#ifndef _CPP_CSTDARG
+#define _CPP_CSTDARG 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cstddef.h b/libstdc++-v3/include/c/std_cstddef.h
index 7502c04e18a8227912391679509e0d946749bf3c..da41736ef9ed15d546a4a00eb1d1a4310e49c411 100644 (file)
--- a/libstdc++-v3/include/c/std_cstddef.h
+++ b/libstdc++-v3/include/c/std_cstddef.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.1  Types
 //
 
-#ifndef _CSTDDEF
-#define _CSTDDEF 1
+#ifndef _CPP_CSTDDEF
+#define _CPP_CSTDDEF 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cstdio.h b/libstdc++-v3/include/c/std_cstdio.h
index 32d1488f5545e17ddadc327bdb859d2efa78bc9e..542b92414ca23046402477f329729efb2a1c0595 100644 (file)
--- a/libstdc++-v3/include/c/std_cstdio.h
+++ b/libstdc++-v3/include/c/std_cstdio.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 27.8.2  C Library files
 //
 
-#ifndef _CSTDIO
-#define _CSTDIO 1
+#ifndef _CPP_CSTDIO
+#define _CPP_CSTDIO 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cstdlib.h b/libstdc++-v3/include/c/std_cstdlib.h
index 1c34b36b6019bb7e67793bcc2944e7cc2a0b268c..57ade0dfb363716d9f3e9f765e1035204eb3e19f 100644 (file)
--- a/libstdc++-v3/include/c/std_cstdlib.h
+++ b/libstdc++-v3/include/c/std_cstdlib.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CSTDLIB
-#define _CSTDLIB 1
+#ifndef _CPP_CSTDLIB
+#define _CPP_CSTDLIB 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cstring.h b/libstdc++-v3/include/c/std_cstring.h
index e5c786d29734ad8c3c8c1cc3f0f93efeb169569f..656ff52be3419d0204ca185c71d2171e4eb514e6 100644 (file)
--- a/libstdc++-v3/include/c/std_cstring.h
+++ b/libstdc++-v3/include/c/std_cstring.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CSTRING
-#define _CSTRING 1
+#ifndef _CPP_CSTRING
+#define _CPP_CSTRING 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_ctime.h b/libstdc++-v3/include/c/std_ctime.h
index 17d965afa905b8cec0056b01c381e6306ef3520d..ba9103ee054fd519d49867b7db75db448d5c0c6b 100644 (file)
--- a/libstdc++-v3/include/c/std_ctime.h
+++ b/libstdc++-v3/include/c/std_ctime.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.5  Date and time
 //
 
-#ifndef _CTIME
-#define _CTIME 1
+#ifndef _CPP_CTIME
+#define _CPP_CTIME 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cwchar.h b/libstdc++-v3/include/c/std_cwchar.h
index 92b53b0379a36161d11854d58315732d8dd7d78d..f9dfbadb9bad6753bc01f256671e058ef85f6503 100644 (file)
--- a/libstdc++-v3/include/c/std_cwchar.h
+++ b/libstdc++-v3/include/c/std_cwchar.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 21.4
 //
 
-#ifndef _CWCHAR
-#define _CWCHAR 1
+#ifndef _CPP_CWCHAR
+#define _CPP_CWCHAR 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c/std_cwctype.h b/libstdc++-v3/include/c/std_cwctype.h
index 53aa0d0f91b54510f35b48de825a37f711bd9a10..ef6b44bd97a3965971023e3b0630fec1510e0698 100644 (file)
--- a/libstdc++-v3/include/c/std_cwctype.h
+++ b/libstdc++-v3/include/c/std_cwctype.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: <cwctype>
 //
 
-#ifndef _CWCTYPE
-#define _CWCTYPE 1
+#ifndef _CPP_CWCTYPE
+#define _CPP_CWCTYPE 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cctype.h b/libstdc++-v3/include/c_std/std_cctype.h
index c21ac9c9cd010f057e0c134dfe5e1158cb6c2bff..68bd182d5192f71a3b116fe3d9051f3b42953d6b 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cctype.h
+++ b/libstdc++-v3/include/c_std/std_cctype.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CCTYPE
-#define _CCTYPE 1
+#ifndef _CPP_CCTYPE
+#define _CPP_CCTYPE 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cerrno.h b/libstdc++-v3/include/c_std/std_cerrno.h
index b9a0743e79a29487d2bf81530168aa508f912cca..7fcecd43917cf4a724e7230086af7b6c6dee185d 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cerrno.h
+++ b/libstdc++-v3/include/c_std/std_cerrno.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CERRNO
-#define _CERRNO 1
+#ifndef _CPP_CERRNO
+#define _CPP_CERRNO 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cfloat.h b/libstdc++-v3/include/c_std/std_cfloat.h
index ab7283e7802af78529384b36f53db6ec66f6d08b..3cc8d7218daa1aeafde8eef1ab795d4f50bbe878 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cfloat.h
+++ b/libstdc++-v3/include/c_std/std_cfloat.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CFLOAT
-#define _CFLOAT 1
+#ifndef _CPP_CFLOAT
+#define _CPP_CFLOAT 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_climits.h b/libstdc++-v3/include/c_std/std_climits.h
index 4e66dd8c3b5547683dbd1d7d4c03641e3cf2142b..242913e60dfbf7328d51249c7bc2428013dbe10c 100644 (file)
--- a/libstdc++-v3/include/c_std/std_climits.h
+++ b/libstdc++-v3/include/c_std/std_climits.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CLIMITS
-#define _CLIMITS       1
+#ifndef _CPP_CLIMITS
+#define _CPP_CLIMITS   1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_clocale.h b/libstdc++-v3/include/c_std/std_clocale.h
index c6a882b6fe104640acfb83e80e0d728d51f26aab..66747d9244c53e3f4e0d1bb757bc090b445ae464 100644 (file)
--- a/libstdc++-v3/include/c_std/std_clocale.h
+++ b/libstdc++-v3/include/c_std/std_clocale.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CLOCALE
-#define _CLOCALE 1
+#ifndef _CPP_CLOCALE
+#define _CPP_CLOCALE 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h
index e804e72d69ba3a62e57af8f358d007f722358d66..e0fffeab9308ba2d333798399801401f79d150ab 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cmath.h
+++ b/libstdc++-v3/include/c_std/std_cmath.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CMATH
-#define _CMATH 1
+#ifndef _CPP_CMATH
+#define _CPP_CMATH 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_csetjmp.h b/libstdc++-v3/include/c_std/std_csetjmp.h
index c5b9119e0b85ad076d89c4f2f14c6b9c8b785cd4..f6df58150019042fb2a6ff99bbea0fc18fc4d7b1 100644 (file)
--- a/libstdc++-v3/include/c_std/std_csetjmp.h
+++ b/libstdc++-v3/include/c_std/std_csetjmp.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CSETJMP
-#define _CSETJMP 1
+#ifndef _CPP_CSETJMP
+#define _CPP_CSETJMP 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_csignal.h b/libstdc++-v3/include/c_std/std_csignal.h
index 8be03f05f4cd22191f034538cb9a8723d4187ccd..1017161d63f17fb2f116035febfafb22487fefdb 100644 (file)
--- a/libstdc++-v3/include/c_std/std_csignal.h
+++ b/libstdc++-v3/include/c_std/std_csignal.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CSIGNAL
-#define _CSIGNAL 1
+#ifndef _CPP_CSIGNAL
+#define _CPP_CSIGNAL 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cstdarg.h b/libstdc++-v3/include/c_std/std_cstdarg.h
index 52979dffa6ccd3a867a4fd3bb594c5432f18fdea..9383adee9a53511c8ee391ced7522616a34fa396 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cstdarg.h
+++ b/libstdc++-v3/include/c_std/std_cstdarg.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CSTDARG
-#define _CSTDARG 1
+#ifndef _CPP_CSTDARG
+#define _CPP_CSTDARG 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cstddef.h b/libstdc++-v3/include/c_std/std_cstddef.h
index b7e56100196bc447cfef9cfe5ce1112d9ef41f27..7a740afb3981725f72d6cfa7bb0785c98c0ed734 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cstddef.h
+++ b/libstdc++-v3/include/c_std/std_cstddef.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CSTDDEF
-#define _CSTDDEF 1
+#ifndef _CPP_CSTDDEF
+#define _CPP_CSTDDEF 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cstdio.h b/libstdc++-v3/include/c_std/std_cstdio.h
index 3b7f32eece4376c623b552cadc03c2ceecba403d..6fb8c79fb3d72220b6ddaa5df9baa7cf00592e16 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cstdio.h
+++ b/libstdc++-v3/include/c_std/std_cstdio.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CSTDIO
-#define _CSTDIO 1
+#ifndef _CPP_CSTDIO
+#define _CPP_CSTDIO 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cstdlib.h b/libstdc++-v3/include/c_std/std_cstdlib.h
index f7168af07fb8f33c243b732143ce3ba7a0c167e0..70fc8d3452e4ef8de2b7b798906bee1d52f05686 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cstdlib.h
+++ b/libstdc++-v3/include/c_std/std_cstdlib.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CSTDLIB
-#define _CSTDLIB 1
+#ifndef _CPP_CSTDLIB
+#define _CPP_CSTDLIB 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cstring.h b/libstdc++-v3/include/c_std/std_cstring.h
index 934e491def64cf7e5469434f1e16681124b17d71..066342aaaba74b6371b32fec0b681b3ab19c0ec0 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cstring.h
+++ b/libstdc++-v3/include/c_std/std_cstring.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CSTRING
-#define _CSTRING 1
+#ifndef _CPP_CSTRING
+#define _CPP_CSTRING 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_ctime.h b/libstdc++-v3/include/c_std/std_ctime.h
index b7ed90698a23e46f7c46b5f3d7c698108d1810bc..1b4c09b77ccfccb4317d32b329f7c20149061645 100644 (file)
--- a/libstdc++-v3/include/c_std/std_ctime.h
+++ b/libstdc++-v3/include/c_std/std_ctime.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CTIME
-#define _CTIME 1
+#ifndef _CPP_CTIME
+#define _CPP_CTIME 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cwchar.h b/libstdc++-v3/include/c_std/std_cwchar.h
index 2e0bbb1cdb96dfa0767ee6718901c4c95ad6cc08..f67f00610f507db644f593db8928247588483b60 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cwchar.h
+++ b/libstdc++-v3/include/c_std/std_cwchar.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CWCHAR
-#define _CWCHAR 1
+#ifndef _CPP_CWCHAR
+#define _CPP_CWCHAR 1
 
 #pragma GCC system_header
 

diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h
index c7c25ae0afbcf31721c0d230b683a25ef2113acc..e469194aa1975daa1d31379129a9376a5c54b2d2 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cwctype.h
+++ b/libstdc++-v3/include/c_std/std_cwctype.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CWCTYPE
-#define _CWCTYPE 1
+#ifndef _CPP_CWCTYPE
+#define _CPP_CWCTYPE 1
 
 #pragma GCC system_header