Hi Bruno,

I pushed this one line patch to update a comment that was written before
localename-unsafe.c existed.

I noticed it while looking at country names again... I'll copy the
explanation from my glibc patch:

> The name "the former Yugoslav Republic of Macedonia" is no longer in use
> since the signing of the Prespa Agreement [1][2].  This resolved the
> country's naming dispute with Greece and changed the name to "North
> Macedonia".
> 
> The name field of this locale/iso-3166.def is not used, so this does not
> affect binaries.
> 
> [1] https://en.wikipedia.org/wiki/Prespa_Agreement
> [2] https://treaties.un.org/Pages/showDetails.aspx?objid=0800000280544ac1

In Gnulib:

    $ grep -rie 'yugoslav'
    lib/setlocale_null.h:   ("FYRO Macedonian_Former Yugoslav Republic of 
Macedonia.1251").  */
    lib/setlocale.c:     MKI  FYRO Macedonian_Former Yugoslav Republic of 
Macedonia.1251
    lib/setlocale.c:    { "MK", "Former Yugoslav Republic of Macedonia" },

I assume these cannot be changed since they are for old Windows APIs?

Collin

[1] 
https://inbox.sourceware.org/libc-alpha/bd1c3df2b8aaaeaf6199e715212db67d2b80266f.1748980203.git.collin.fu...@gmail.com/T/#u

>From 61c4a6ae9ebdbabdfdcc0175b6f467419bada300 Mon Sep 17 00:00:00 2001
Message-ID: <61c4a6ae9ebdbabdfdcc0175b6f467419bada300.1748980594.git.collin.fu...@gmail.com>
From: Collin Funk <[email protected]>
Date: Tue, 3 Jun 2025 12:55:03 -0700
Subject: [PATCH] setlocale: Update a comment.

* lib/setlocale.c: Mention that gl_locale_name_from_win32_LANGID is now
defined in localename-unsafe.c instead of localename.c.
---
 ChangeLog       | 6 ++++++
 lib/setlocale.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 93503e5aaf..abd0ee05b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-06-03  Collin Funk  <[email protected]>
+
+	setlocale: Update a comment.
+	* lib/setlocale.c: Mention that gl_locale_name_from_win32_LANGID is now
+	defined in localename-unsafe.c instead of localename.c.
+
 2025-06-03  Bruno Haible  <[email protected]>
 
 	stdcountof-h tests: Fix compilation error with gcc versions < 15.
diff --git a/lib/setlocale.c b/lib/setlocale.c
index b5a9bdf89c..ea8b4ba89b 100644
--- a/lib/setlocale.c
+++ b/lib/setlocale.c
@@ -464,7 +464,7 @@ static const struct table_entry language_table[] =
 
 /* Table from ISO 3166 country code to English name.
    Keep in sync with the gl_locale_name_from_win32_LANGID function in
-   localename.c!  */
+   localename-unsafe.c!  */
 static const struct table_entry country_table[] =
   {
     { "AE", "U.A.E." },
-- 
2.49.0

Reply via email to