Undo last change - GetLocaleInfo is usable on Windows 95/98/ME.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 2e103cc5cf6271cb1190c5b39af2d58583d087c3..f98aedb76554260d2f712fbb382d8d43c6c074d6 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,7 +1,3 @@
-2007-01-09  Bruno Haible  <bruno@clisp.org>
-
-       * localename.c (_nl_locale_name_default): Add comment.
-
 2006-12-21  Bruno Haible  <bruno@clisp.org>
 
        * localename.c (SUBLANG_BENGALI_INDIA): Change value from 0 to 1.

diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index ca61fdf339e2711802517d7de7dfc4b2961ad107..95133b0b1e459175553c59efbe24f92941cb525c 100644 (file)
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -1,5 +1,5 @@
 /* Determine the current selected locale.
-   Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -1085,12 +1085,6 @@ _nl_locale_name_default (void)
     /* Use native Win32 API locale ID.  */
     lcid = GetThreadLocale ();
 
-    /* We cannot use the Win32 API function GetLocaleInfo() because it
-       does not exist on Windows 95/98/ME unless "Microsoft Layer for Unicode"
-       is installed.
-       Also, we cannot use the Win32 API function GetLocaleInfoEx() because
-       it does not exist on Windows 95/98/ME/NT/2000/XP.  */
-
     /* Strip off the sorting rules, keep only the language part.  */
     langid = LANGIDFROMLCID (lcid);