Patch to remove C9X references from libstdc++-v3

Joseph S. Myers jsm28@cam.ac.uk
Sat Nov 25 11:52:00 GMT 2000


I've installed as obvious the following libstdc++-v3 patch to get rid
of obsolete C9X references.

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/ChangeLog,v
retrieving revision 1.302
diff -u -r1.302 ChangeLog
--- ChangeLog	2000/11/25 09:11:14	1.302
+++ ChangeLog	2000/11/25 19:35:43
@@ -1,3 +1,12 @@
+2000-11-25  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* 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  <bkoz@redhat.com>
             Richard Earnshaw  <rearnsha@arm.com>

Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.96
diff -u -r1.96 acinclude.m4
--- acinclude.m4	2000/11/21 20:53:35	1.96
+++ acinclude.m4	2000/11/25 19:35:43
@@ -956,11 +956,11 @@
 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_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 @@
       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)
Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/aclocal.m4,v
retrieving revision 1.97
diff -u -r1.97 aclocal.m4
--- aclocal.m4	2000/11/21 20:53:35	1.97
+++ aclocal.m4	2000/11/25 19:35:44
@@ -968,11 +968,11 @@
 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_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 @@
       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)
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure,v
retrieving revision 1.105
diff -u -r1.105 configure
--- configure	2000/11/24 23:48:44	1.105
+++ configure	2000/11/25 19:35:44
@@ -17516,15 +17516,15 @@
 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 $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
Index: config/os/gnu-linux/bits/os_defines.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h,v
retrieving revision 1.5
diff -u -r1.5 os_defines.h
--- os_defines.h	2000/11/23 11:30:45	1.5
+++ os_defines.h	2000/11/25 19:35:44
@@ -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.
Index: src/complex.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/complex.cc,v
retrieving revision 1.9
diff -u -r1.9 complex.cc
--- complex.cc	2000/11/20 21:13:07	1.9
+++ complex.cc	2000/11/25 19:35:44
@@ -29,7 +29,7 @@

 #include <bits/std_complex.h>

-// This is a ISO C 9X header.
+// This is a ISO C99 header.
 #include <mathconf.h>
 #undef complex

Index: testsuite/22_locale/codecvt_wchar_t_char.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/22_locale/codecvt_wchar_t_char.cc,v
retrieving revision 1.3
diff -u -r1.3 codecvt_wchar_t_char.cc
--- codecvt_wchar_t_char.cc	2000/11/24 23:48:45	1.3
+++ codecvt_wchar_t_char.cc	2000/11/25 19:35:44
@@ -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;
Index: include/bits/stl_config.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/stl_config.h,v
retrieving revision 1.2
diff -u -r1.2 stl_config.h
--- stl_config.h	2000/10/30 13:15:24	1.2
+++ stl_config.h	2000/11/25 19:35:44
@@ -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.
Index: include/c/bits/std_cwchar.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/c/bits/std_cwchar.h,v
retrieving revision 1.3
diff -u -r1.3 std_cwchar.h
--- std_cwchar.h	2000/11/03 23:01:19	1.3
+++ std_cwchar.h	2000/11/25 19:35:44
@@ -111,7 +111,7 @@
   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);
Index: libmath/mathconf.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/libmath/mathconf.h,v
retrieving revision 1.1
diff -u -r1.1 mathconf.h
--- mathconf.h	2000/10/07 01:01:45	1.1
+++ mathconf.h	2000/11/25 19:35:44
@@ -130,7 +130,7 @@

 /* 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 @@

 /* 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__ 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);

-- 
Joseph S. Myers
jsm28@cam.ac.uk



More information about the Libstdc++ mailing list