From 7dce93e95aed216724eb68e966450f85dba6a979 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 31 Jul 2003 06:27:05 +0000
Subject: [PATCH] Fix comments to identify Solaris versions using the same
 version numbers that Sun does.

---
 lib/linebreak.c | 8 ++++----
 lib/mbswidth.c  | 2 +-
 lib/putenv.c    | 2 +-
 lib/unicodeio.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/linebreak.c b/lib/linebreak.c
index c0ae08281..8623eb033 100644
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -1383,7 +1383,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)
   {
@@ -1448,7 +1448,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))
@@ -1498,7 +1498,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)
@@ -1591,7 +1591,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/lib/mbswidth.c b/lib/mbswidth.c
index a2ef5b3fd..c6f91db97 100644
--- a/lib/mbswidth.c
+++ b/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
diff --git a/lib/putenv.c b/lib/putenv.c
index 0b1e6644e..f5ce1dd88 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -33,7 +33,7 @@ extern int errno;
 # define __set_errno(ev) ((errno) = (ev))
 #endif
 
-/* Don't include stdlib.h because some (e.g., Solaris 2.7) declare putenv
+/* Don't include stdlib.h because some (e.g., Solaris 7) declare putenv
    with a non-const argument.  That would conflict with the declaration of
    rpl_putenv below (due to the #define putenv rpl_putenv from config.h).  */
 
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 30fbb2afd..7b7f6f229 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -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)
 
-- 
2.11.0