Merge branch 'dfsg-orig' into dfsg-debian

[tar] / gnu / localcharset.c

diff --git a/gnu/localcharset.c b/gnu/localcharset.c
index 4255174418b5b14cde8935f6df3f38bd86413ac0..794fec6bef28f2965436a94abf8f6bd8b8e51186 100644 (file)
--- a/gnu/localcharset.c
+++ b/gnu/localcharset.c
@@ -371,10 +371,9 @@ locale_charset (void)
   codeset = nl_langinfo (CODESET);
 
 #  ifdef __CYGWIN__
-  /* Cygwin 1.5.x does not have locales.  nl_langinfo (CODESET) always
-     returns "US-ASCII".  As long as this is not fixed, return the suffix
-     of the locale name from the environment variables (if present) or
-     the codepage as a number.  */
+  /* Cygwin < 1.7 does not have locales.  nl_langinfo (CODESET) always
+     returns "US-ASCII".  Return the suffix of the locale name from the
+     environment variables (if present) or the codepage as a number.  */
   if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
     {
       const char *locale;