From: Bruno Haible Date: Tue, 9 Jan 2007 16:18:04 +0000 (+0000) Subject: Undo last change - GetLocaleInfo is usable on Windows 95/98/ME. X-Git-Tag: v0.17~513 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eedae141388c61ea59af5ffcb90f30a6263cb354;p=thirdparty%2Fgettext.git Undo last change - GetLocaleInfo is usable on Windows 95/98/ME. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 2e103cc5c..f98aedb76 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,7 +1,3 @@ -2007-01-09 Bruno Haible - - * localename.c (_nl_locale_name_default): Add comment. - 2006-12-21 Bruno Haible * 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 ca61fdf33..95133b0b1 100644 --- 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);