From 7ee9826b8948108efe07737f5c44cc34e5d7b5c0 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sat, 25 Nov 2000 19:36:53 +0000 Subject: [PATCH] acinclude.m4: Change C9X references to refer to C99. * acinclude.m4: Change C9X references to refer to C99. * aclocal.m4, configure: Regenerate. * config/os/gnu-linux/bits/os_defines.h, src/complex.cc, testsuite/22_locale/codecvt_wchar_t_char.cc, include/bits/stl_config.h, include/c/bits/std_cwchar.h, libmath/mathconf.h: Change C9X references to refer to C99. From-SVN: r37743 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/acinclude.m4 | 14 +++++++------- libstdc++-v3/aclocal.m4 | 14 +++++++------- libstdc++-v3/config/os/gnu-linux/bits/os_defines.h | 2 +- libstdc++-v3/configure | 12 ++++++------ libstdc++-v3/include/bits/stl_config.h | 4 ++-- libstdc++-v3/include/c/bits/std_cwchar.h | 2 +- libstdc++-v3/libmath/mathconf.h | 6 +++--- libstdc++-v3/src/complex.cc | 2 +- .../testsuite/22_locale/codecvt_wchar_t_char.cc | 2 +- 10 files changed, 38 insertions(+), 29 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 416ac8218ea..a41e3b8efd3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2000-11-25 Joseph S. Myers + + * acinclude.m4: Change C9X references to refer to C99. + * aclocal.m4, configure: Regenerate. + * config/os/gnu-linux/bits/os_defines.h, src/complex.cc, + testsuite/22_locale/codecvt_wchar_t_char.cc, + include/bits/stl_config.h, include/c/bits/std_cwchar.h, + libmath/mathconf.h: Change C9X references to refer to C99. + 2000-11-25 Benjamin Kosnik Richard Earnshaw diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 53de226aea7..2d323db78ea 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -956,11 +956,11 @@ dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ if test x$enable_c_mbchar != xno; then - dnl Sanity check for existence of ISO C9X headers for extended encoding. + dnl Sanity check for existence of ISO C99 headers for extended encoding. AC_CHECK_HEADER(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no) AC_CHECK_HEADER(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no) - dnl Only continue checking if the ISO C9X headers exist. + dnl Only continue checking if the ISO C99 headers exist. if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes; then dnl Test wchar.h for mbstate_t, which is needed for char_traits @@ -996,14 +996,14 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset \ wcsrtombs mbsrtowcs, ac_wfuncs=yes, ac_wfuncs=no) - AC_MSG_CHECKING([for ISO C9X wchar_t support]) + AC_MSG_CHECKING([for ISO C99 wchar_t support]) if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes \ && test x"$ac_wfuncs" = xyes; then - ac_isoC9X_wchar_t=yes + ac_isoC99_wchar_t=yes else - ac_isoC9X_wchar_t=no + ac_isoC99_wchar_t=no fi - AC_MSG_RESULT($ac_isoC9X_wchar_t) + AC_MSG_RESULT($ac_isoC99_wchar_t) dnl Use iconv for wchar_t to char conversions. As such, check for dnl X/Open Portability Guide, version 2 features (XPG2). @@ -1032,7 +1032,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ dnl At the moment, only enable wchar_t specializations if all the dnl above support is present. AC_MSG_CHECKING([for enabled wchar_t specializations]) - if test x"$ac_isoC9X_wchar_t" = xyes \ + if test x"$ac_isoC99_wchar_t" = xyes \ && test x"$ac_XPG2_wchar_t" = xyes; then libinst_wstring_la="libinst-wstring.la" AC_DEFINE(_GLIBCPP_USE_WCHAR_T) diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 3821f9f9043..e3580f27e29 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -968,11 +968,11 @@ dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ if test x$enable_c_mbchar != xno; then - dnl Sanity check for existence of ISO C9X headers for extended encoding. + dnl Sanity check for existence of ISO C99 headers for extended encoding. AC_CHECK_HEADER(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no) AC_CHECK_HEADER(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no) - dnl Only continue checking if the ISO C9X headers exist. + dnl Only continue checking if the ISO C99 headers exist. if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes; then dnl Test wchar.h for mbstate_t, which is needed for char_traits @@ -1008,14 +1008,14 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset \ wcsrtombs mbsrtowcs, ac_wfuncs=yes, ac_wfuncs=no) - AC_MSG_CHECKING([for ISO C9X wchar_t support]) + AC_MSG_CHECKING([for ISO C99 wchar_t support]) if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes \ && test x"$ac_wfuncs" = xyes; then - ac_isoC9X_wchar_t=yes + ac_isoC99_wchar_t=yes else - ac_isoC9X_wchar_t=no + ac_isoC99_wchar_t=no fi - AC_MSG_RESULT($ac_isoC9X_wchar_t) + AC_MSG_RESULT($ac_isoC99_wchar_t) dnl Use iconv for wchar_t to char conversions. As such, check for dnl X/Open Portability Guide, version 2 features (XPG2). @@ -1044,7 +1044,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ dnl At the moment, only enable wchar_t specializations if all the dnl above support is present. AC_MSG_CHECKING([for enabled wchar_t specializations]) - if test x"$ac_isoC9X_wchar_t" = xyes \ + if test x"$ac_isoC99_wchar_t" = xyes \ && test x"$ac_XPG2_wchar_t" = xyes; then libinst_wstring_la="libinst-wstring.la" AC_DEFINE(_GLIBCPP_USE_WCHAR_T) diff --git a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h index 3289d0c5ad4..a74dbf43a59 100644 --- a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h +++ b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h @@ -34,7 +34,7 @@ // By enabling this, all GNU extensions are enabled. #define _GNU_SOURCE 1 -// By enabling this, all ISO C99, ISO C9X functionality is enabled. +// By enabling this, all ISO C99 functionality is enabled. #define _ISOC99_SOURCE 1 // This keeps isanum, et al from being propagated as macros. diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 0f4dc49b8f0..514c937aa37 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -17516,15 +17516,15 @@ fi done - echo $ac_n "checking for ISO C9X wchar_t support""... $ac_c" 1>&6 -echo "configure:17521: checking for ISO C9X wchar_t support" >&5 + echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 +echo "configure:17521: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes \ && test x"$ac_wfuncs" = xyes; then - ac_isoC9X_wchar_t=yes + ac_isoC99_wchar_t=yes else - ac_isoC9X_wchar_t=no + ac_isoC99_wchar_t=no fi - echo "$ac_t""$ac_isoC9X_wchar_t" 1>&6 + echo "$ac_t""$ac_isoC99_wchar_t" 1>&6 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 @@ -17710,7 +17710,7 @@ echo "configure:17703: checking for XPG2 wchar_t support" >&5 echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 echo "configure:17713: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC9X_wchar_t" = xyes \ + if test x"$ac_isoC99_wchar_t" = xyes \ && test x"$ac_XPG2_wchar_t" = xyes; then libinst_wstring_la="libinst-wstring.la" cat >> confdefs.h <<\EOF diff --git a/libstdc++-v3/include/bits/stl_config.h b/libstdc++-v3/include/bits/stl_config.h index 9183a998fb1..d5301e2a5a3 100644 --- a/libstdc++-v3/include/bits/stl_config.h +++ b/libstdc++-v3/include/bits/stl_config.h @@ -85,8 +85,8 @@ // synchronization. UIthreads are similar to pthreads, but are based // on an earlier version of the Posix threads standard. // * __STL_LONG_LONG if the compiler has long long and unsigned long long -// types. (They're not in the C++ standard, but they are expected to be -// included in the forthcoming C9X standard.) +// types. (They're not in the C++ standard, but they are included +// in the C99 standard.) // * __STL_THREADS is defined if thread safety is needed. // * __STL_VOLATILE is defined to be "volatile" if threads are being // used, and the empty string otherwise. diff --git a/libstdc++-v3/include/c/bits/std_cwchar.h b/libstdc++-v3/include/c/bits/std_cwchar.h index 3e0a75ee904..3a389e7f6f3 100644 --- a/libstdc++-v3/include/c/bits/std_cwchar.h +++ b/libstdc++-v3/include/c/bits/std_cwchar.h @@ -111,7 +111,7 @@ namespace std extern "C" size_t wcsftime(wchar_t*, size_t, const wchar_t*, const struct tm*); #if 0 - // Full C9X listing + // Full C99 listing extern "C" long double wcstold(const wchar_t*, wchar_t**); extern "C" long long int wcstoll(const wchar_t*, wchar_t**, int); extern "C" unsigned long long int wcstoull(const wchar_t*, wchar_t**, int); diff --git a/libstdc++-v3/libmath/mathconf.h b/libstdc++-v3/libmath/mathconf.h index 3f4503cc162..c6e66e2bf9c 100644 --- a/libstdc++-v3/libmath/mathconf.h +++ b/libstdc++-v3/libmath/mathconf.h @@ -130,7 +130,7 @@ double nan (void); /* Test whether number is finite. */ #ifdef isfinite -/* This is an ISO C 9x function. */ +/* This is an ISO C99 function. */ # define FINITE_P(X) isfinite (X) # define FINITEF_P(X) isfinite (X) # define FINITEL_P(X) isfinite (X) @@ -175,7 +175,7 @@ double nan (void); /* Test whether number is infinite. */ #ifdef isinf -/* This is an ISO C 9x macro. */ +/* This is an ISO C99 macro. */ # define INFINITE_P(X) isinf (X) # define INFINITEF_P(X) isinf (X) # define INFINITEL_P(X) isinf (X) @@ -236,7 +236,7 @@ __complex__ double c_log (__complex__ double x); __complex__ float c_logf (__complex__ float x); __complex__ long double c_logl (__complex__ long double x); -/* signbit is a macro in ISO C 9x. */ +/* signbit is a macro in ISO C99. */ #ifndef signbit extern int __signbitf (float); extern int __signbit (double); diff --git a/libstdc++-v3/src/complex.cc b/libstdc++-v3/src/complex.cc index 33280e5670d..3dd4d7e05f1 100644 --- a/libstdc++-v3/src/complex.cc +++ b/libstdc++-v3/src/complex.cc @@ -29,7 +29,7 @@ #include -// This is a ISO C 9X header. +// This is a ISO C99 header. #include #undef complex diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc index 3f7c83bcb39..8ea65743a1f 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc @@ -26,7 +26,7 @@ // Need to explicitly set the state(mbstate_t) to zero. -// How to do this is not specified by the ISO C9X standard, so we +// How to do this is not specified by the ISO C99 standard, so we // might need to add some operators to make the intuiative case // work: // w_codecvt::state_type state00;