[Bug-gnulib] proposed Solaris comment patch (linebreak.c, mbswidth.c, unicodeio.c)

[Paul Eggert]

Here are some proposed changes to comments in linebreak.c, mbswidth.c,
and unicodeio.c to fix some incorrect Solaris version numbers, or
nonstandard spelling of Solaris versions.


Index: lib/linebreak.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/linebreak.c,v
retrieving revision 1.3
diff -p -u -r1.3 linebreak.c
--- lib/linebreak.c     12 May 2003 09:49:42 -0000      1.3
+++ lib/linebreak.c     22 Jul 2003 22:35:21 -0000
@@ -1383,7 +1383,7 @@ iconv_string_length (iconv_t cd, const c
         return (size_t)(-1);
       count += outptr - tmpbuf;
     }
-  /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
+  /* Avoid glibc-2.1 bug and Solaris 7 through 9 bug.  */
 #if defined _LIBICONV_VERSION \
     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   {
@@ -1448,7 +1448,7 @@ iconv_string_keeping_offsets (iconv_t cd
       if (res == (size_t)(-1))
         abort ();
     }
-  /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
+  /* Avoid glibc-2.1 bug and Solaris 7 bug.  */
 #if defined _LIBICONV_VERSION \
     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
   if (iconv (cd, NULL, NULL, &outptr, &outsize) == (size_t)(-1))
@@ -1498,7 +1498,7 @@ mbs_possible_linebreaks (const char *s, 
        to_utf8 = (iconv_t)(-1);
       else
 # endif
-      /* Avoid Solaris 2.9 bug with GB2312, EUC-TW, BIG5, BIG5-HKSCS, GBK,
+      /* Avoid Solaris 9 bug with GB2312, EUC-TW, BIG5, BIG5-HKSCS, GBK,
          GB18030.  */
 # if defined __sun && !defined _LIBICONV_VERSION
       if (   STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
@@ -1591,7 +1591,7 @@ mbs_width_linebreaks (const char *s, siz
        to_utf8 = (iconv_t)(-1);
       else
 # endif
-      /* Avoid Solaris 2.9 bug with GB2312, EUC-TW, BIG5, BIG5-HKSCS, GBK,
+      /* Avoid Solaris 9 bug with GB2312, EUC-TW, BIG5, BIG5-HKSCS, GBK,
          GB18030.  */
 # if defined __sun && !defined _LIBICONV_VERSION
       if (   STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
Index: lib/mbswidth.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/mbswidth.c,v
retrieving revision 1.9
diff -p -u -r1.9 mbswidth.c
--- lib/mbswidth.c      19 Nov 2002 13:58:19 -0000      1.9
+++ lib/mbswidth.c      22 Jul 2003 22:35:22 -0000
@@ -75,7 +75,7 @@ int wcwidth ();
 #else
 # define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif
-/* Undefine to protect against the definition in wctype.h of solaris2.6.   */
+/* Undefine to protect against the definition in wctype.h of Solaris 2.6.   */
 #undef ISPRINT
 #define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
 #undef ISCNTRL
Index: lib/unicodeio.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/unicodeio.c,v
retrieving revision 1.22
diff -p -u -r1.22 unicodeio.c
--- lib/unicodeio.c     14 Jul 2003 16:36:07 -0000      1.22
+++ lib/unicodeio.c     22 Jul 2003 22:35:22 -0000
@@ -186,7 +186,7 @@ unicode_to_mb (unsigned int code,
          )
        return failure (code, NULL, callback_arg);
 
-      /* Avoid glibc-2.1 bug and Solaris 2.7 bug.  */
+      /* Avoid glibc-2.1 bug and Solaris 7 bug.  */
 # if defined _LIBICONV_VERSION \
     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)