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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51431 138bc75d-0d04-0410-961f-82ee72b054a4

16 files changed, 32 insertions, 32 deletions

diff --git a/libstdc++-v3/include/c/std_cctype.h b/libstdc++-v3/include/c/std_cctype.h
index 1271e072a69..9d84a3d68b7 100644
--- 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 dea3c0e9398..93ba8684389 100644
--- 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 bcdb5f7bc29..9c95760b38b 100644
--- 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 acfbe9b57bf..9194cb9adf7 100644
--- 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 6ac30a77fd7..b6b3c22268a 100644
--- 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 fb53a2dafbf..33ac50b9f9a 100644
--- 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 77616608495..011907bbaa1 100644
--- 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 6f2790c5b31..09614e7ea01 100644
--- 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 b91c3c00a26..d2cb5441579 100644
--- 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 7502c04e18a..da41736ef9e 100644
--- 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 32d1488f554..542b92414ca 100644
--- 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 1c34b36b601..57ade0dfb36 100644
--- 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 e5c786d2973..656ff52be34 100644
--- 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 17d965afa90..ba9103ee054 100644
--- 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 92b53b0379a..f9dfbadb9ba 100644
--- 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 53aa0d0f91b..ef6b44bd97a 100644
--- 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