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
2002-03-27 04:29:32 +00:00 · 2002-03-27 04:29:32 +00:00 · 3eb35fcfd4
commit 3eb35fcfd4
parent aee8f532df
35 changed files with 86 additions and 72 deletions
--- 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>

--- 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} \
--- 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} \
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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