Commit 3eb35fcf by Benjamin Kosnik Committed by Benjamin Kosnik

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
parent aee8f532
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> 2002-03-25 Paolo Carlini <pcarlini@unitus.it>
Richard Henderson <rth@redhat.com> Richard Henderson <rth@redhat.com>
......
...@@ -324,7 +324,7 @@ stamp-bits: ${bits_headers} ...@@ -324,7 +324,7 @@ stamp-bits: ${bits_headers}
(cd ${bits_builddir} && @LN_S@ $? . || true) ;\ (cd ${bits_builddir} && @LN_S@ $? . || true) ;\
echo `date` > stamp-bits 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 \ @if [ ! -d "${c_base_builddir}" ]; then \
mkdir -p ${c_base_builddir} ;\ mkdir -p ${c_base_builddir} ;\
fi ;\ fi ;\
...@@ -332,7 +332,9 @@ stamp-c_base: ${c_base_headers} ${c_base_headers_extra} ...@@ -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$$,,'` ;\ official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
@LN_S@ $$h ./$${official_name} || true ;\ @LN_S@ $$h ./$${official_name} || true ;\
done) ;\ 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 echo `date` > stamp-c_base
stamp-backward: ${backward_headers} stamp-backward: ${backward_headers}
...@@ -434,8 +436,9 @@ install-data-local: ...@@ -434,8 +436,9 @@ install-data-local:
for file in ${c_base_headers_rename}; do \ for file in ${c_base_headers_rename}; do \
$(INSTALL_DATA) ${c_base_builddir}/$${file} \ $(INSTALL_DATA) ${c_base_builddir}/$${file} \
${gxx_include_dir}/${c_base_builddir}; done ${gxx_include_dir}/${c_base_builddir}; done
for file in ${c_base_headers_extra}; do \ c_base_headers_extra_install=${c_base_headers_extra};\
$(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done 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} $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
for file in ${std_headers_rename}; do \ for file in ${std_headers_rename}; do \
$(INSTALL_DATA) ${std_builddir}/$${file} \ $(INSTALL_DATA) ${std_builddir}/$${file} \
......
...@@ -569,7 +569,7 @@ stamp-bits: ${bits_headers} ...@@ -569,7 +569,7 @@ stamp-bits: ${bits_headers}
(cd ${bits_builddir} && @LN_S@ $? . || true) ;\ (cd ${bits_builddir} && @LN_S@ $? . || true) ;\
echo `date` > stamp-bits 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 \ @if [ ! -d "${c_base_builddir}" ]; then \
mkdir -p ${c_base_builddir} ;\ mkdir -p ${c_base_builddir} ;\
fi ;\ fi ;\
...@@ -577,7 +577,9 @@ stamp-c_base: ${c_base_headers} ${c_base_headers_extra} ...@@ -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$$,,'` ;\ official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
@LN_S@ $$h ./$${official_name} || true ;\ @LN_S@ $$h ./$${official_name} || true ;\
done) ;\ 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 echo `date` > stamp-c_base
stamp-backward: ${backward_headers} stamp-backward: ${backward_headers}
...@@ -665,8 +667,9 @@ install-data-local: ...@@ -665,8 +667,9 @@ install-data-local:
for file in ${c_base_headers_rename}; do \ for file in ${c_base_headers_rename}; do \
$(INSTALL_DATA) ${c_base_builddir}/$${file} \ $(INSTALL_DATA) ${c_base_builddir}/$${file} \
${gxx_include_dir}/${c_base_builddir}; done ${gxx_include_dir}/${c_base_builddir}; done
for file in ${c_base_headers_extra}; do \ c_base_headers_extra_install=${c_base_headers_extra};\
$(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done 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} $(INSTALL) -d ${gxx_include_dir}/${std_builddir}
for file in ${std_headers_rename}; do \ for file in ${std_headers_rename}; do \
$(INSTALL_DATA) ${std_builddir}/$${file} \ $(INSTALL_DATA) ${std_builddir}/$${file} \
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: <ccytpe> // ISO C++ 14882: <ccytpe>
// //
#ifndef _CCTYPE #ifndef _CPP_CCTYPE
#define _CCTYPE 1 #define _CPP_CCTYPE 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 19.3 Error numbers // ISO C++ 14882: 19.3 Error numbers
// //
#ifndef _CERRNO #ifndef _CPP_CERRNO
#define _CERRNO 1 #define _CPP_CERRNO 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 18.2.2 Implementation properties: C library // ISO C++ 14882: 18.2.2 Implementation properties: C library
// //
#ifndef _CFLOAT #ifndef _CPP_CFLOAT
#define _CFLOAT 1 #define _CPP_CFLOAT 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 18.2.2 Implementation properties: C library // ISO C++ 14882: 18.2.2 Implementation properties: C library
// //
#ifndef _CLIMITS #ifndef _CPP_CLIMITS
#define _CLIMITS 1 #define _CPP_CLIMITS 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 18.2.2 Implementation properties: C library // ISO C++ 14882: 18.2.2 Implementation properties: C library
// //
#ifndef _CLOCALE #ifndef _CPP_CLOCALE
#define _CLOCALE 1 #define _CPP_CLOCALE 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 26.5 C library // ISO C++ 14882: 26.5 C library
// //
#ifndef _CMATH #ifndef _CPP_CMATH
#define _CMATH 1 #define _CPP_CMATH 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 20.4.6 C library // ISO C++ 14882: 20.4.6 C library
// //
#ifndef _CSETJMP #ifndef _CPP_CSETJMP
#define _CSETJMP 1 #define _CPP_CSETJMP 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 20.4.6 C library // ISO C++ 14882: 20.4.6 C library
// //
#ifndef _CSIGNAL #ifndef _CPP_CSIGNAL
#define _CSIGNAL 1 #define _CPP_CSIGNAL 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 20.4.6 C library // ISO C++ 14882: 20.4.6 C library
// //
#ifndef _CSTDARG #ifndef _CPP_CSTDARG
#define _CSTDARG 1 #define _CPP_CSTDARG 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 18.1 Types // ISO C++ 14882: 18.1 Types
// //
#ifndef _CSTDDEF #ifndef _CPP_CSTDDEF
#define _CSTDDEF 1 #define _CPP_CSTDDEF 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 27.8.2 C Library files // ISO C++ 14882: 27.8.2 C Library files
// //
#ifndef _CSTDIO #ifndef _CPP_CSTDIO
#define _CSTDIO 1 #define _CPP_CSTDIO 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 20.4.6 C library // ISO C++ 14882: 20.4.6 C library
// //
#ifndef _CSTDLIB #ifndef _CPP_CSTDLIB
#define _CSTDLIB 1 #define _CPP_CSTDLIB 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 20.4.6 C library // ISO C++ 14882: 20.4.6 C library
// //
#ifndef _CSTRING #ifndef _CPP_CSTRING
#define _CSTRING 1 #define _CPP_CSTRING 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 20.5 Date and time // ISO C++ 14882: 20.5 Date and time
// //
#ifndef _CTIME #ifndef _CPP_CTIME
#define _CTIME 1 #define _CPP_CTIME 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: 21.4 // ISO C++ 14882: 21.4
// //
#ifndef _CWCHAR #ifndef _CPP_CWCHAR
#define _CWCHAR 1 #define _CPP_CWCHAR 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// ISO C++ 14882: <cwctype> // ISO C++ 14882: <cwctype>
// //
#ifndef _CWCTYPE #ifndef _CPP_CWCTYPE
#define _CWCTYPE 1 #define _CPP_CWCTYPE 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CCTYPE #ifndef _CPP_CCTYPE
#define _CCTYPE 1 #define _CPP_CCTYPE 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CERRNO #ifndef _CPP_CERRNO
#define _CERRNO 1 #define _CPP_CERRNO 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CFLOAT #ifndef _CPP_CFLOAT
#define _CFLOAT 1 #define _CPP_CFLOAT 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CLIMITS #ifndef _CPP_CLIMITS
#define _CLIMITS 1 #define _CPP_CLIMITS 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CLOCALE #ifndef _CPP_CLOCALE
#define _CLOCALE 1 #define _CPP_CLOCALE 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CMATH #ifndef _CPP_CMATH
#define _CMATH 1 #define _CPP_CMATH 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CSETJMP #ifndef _CPP_CSETJMP
#define _CSETJMP 1 #define _CPP_CSETJMP 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CSIGNAL #ifndef _CPP_CSIGNAL
#define _CSIGNAL 1 #define _CPP_CSIGNAL 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CSTDARG #ifndef _CPP_CSTDARG
#define _CSTDARG 1 #define _CPP_CSTDARG 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CSTDDEF #ifndef _CPP_CSTDDEF
#define _CSTDDEF 1 #define _CPP_CSTDDEF 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CSTDIO #ifndef _CPP_CSTDIO
#define _CSTDIO 1 #define _CPP_CSTDIO 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CSTDLIB #ifndef _CPP_CSTDLIB
#define _CSTDLIB 1 #define _CPP_CSTDLIB 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CSTRING #ifndef _CPP_CSTRING
#define _CSTRING 1 #define _CPP_CSTRING 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CTIME #ifndef _CPP_CTIME
#define _CTIME 1 #define _CPP_CTIME 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CWCHAR #ifndef _CPP_CWCHAR
#define _CWCHAR 1 #define _CPP_CWCHAR 1
#pragma GCC system_header #pragma GCC system_header
......
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
* contained in the namespace @c std. * contained in the namespace @c std.
*/ */
#ifndef _CWCTYPE #ifndef _CPP_CWCTYPE
#define _CWCTYPE 1 #define _CPP_CWCTYPE 1
#pragma GCC system_header #pragma GCC system_header
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment