Use official Solaris names.

diff --git a/gettext-tools/lib/linebreak.c b/gettext-tools/lib/linebreak.c
index a541a77351137f1223c8296fffdae4905abc0570..87071e90793372caa8512df3b4eb8e20f27a6bd9 100644 (file)
--- a/gettext-tools/lib/linebreak.c
+++ b/gettext-tools/lib/linebreak.c
@@ -1395,7 +1395,7 @@ iconv_string_length (iconv_t cd, const char *s, size_t n)
         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)
   {
@@ -1460,7 +1460,7 @@ iconv_string_keeping_offsets (iconv_t cd, const char *s, size_t n,
       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))
@@ -1512,7 +1512,7 @@ mbs_possible_linebreaks (const char *s, size_t n, const char *encoding,
        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)
@@ -1607,7 +1607,7 @@ mbs_width_linebreaks (const char *s, size_t n,
        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)

diff --git a/gettext-tools/lib/mbswidth.c b/gettext-tools/lib/mbswidth.c
index a2ef5b3fdaf5af14677c3cebc2199224ce69a12f..c6f91db971a104f138f4937ec6b70bf7e15de1a3 100644 (file)
--- a/gettext-tools/lib/mbswidth.c
+++ b/gettext-tools/lib/mbswidth.c
@@ -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