localcharset: Remove support for OSF/1.

* lib/localcharset.h: Update comments.
* lib/localcharset.c (alias_table): Remove entries for OSF/1.

diff --git a/ChangeLog b/ChangeLog
index fd77f80b233b28bbc792979796b2c839baa4815b..a03ca39e42e9ddff9a5f21a4ab499507e25962a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+       localcharset: Remove support for OSF/1.
+       * lib/localcharset.h: Update comments.
+       * lib/localcharset.c (alias_table): Remove entries for OSF/1.
+
        ldd: Remove support for OSF/1.
        * m4/ldd.m4 (gl_LDD): Remove code for OSF/1.
 

diff --git a/lib/localcharset.c b/lib/localcharset.c
index 32f6f78e82c55cadd818c20c5665039ea48073eb..0c05f35e5b4ce7e1ebc1b1107ddee2d6ed855cb3 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -292,32 +292,6 @@ static const struct table_entry alias_table[] =
     { "eucTW",      "EUC-TW" }
 #   define alias_table_defined
 #  endif
-#  if defined __osf__                                       /* OSF/1 */
-  /*{ "GBK",        "GBK" },*/
-    { "ISO8859-1",  "ISO-8859-1" },
-    { "ISO8859-15", "ISO-8859-15" },
-    { "ISO8859-2",  "ISO-8859-2" },
-    { "ISO8859-4",  "ISO-8859-4" },
-    { "ISO8859-5",  "ISO-8859-5" },
-    { "ISO8859-7",  "ISO-8859-7" },
-    { "ISO8859-8",  "ISO-8859-8" },
-    { "ISO8859-9",  "ISO-8859-9" },
-    { "KSC5601",    "CP949" },
-    { "SJIS",       "SHIFT_JIS" },
-    { "TACTIS",     "TIS-620" },
-  /*{ "UTF-8",      "UTF-8" },*/
-    { "big5",       "BIG5" },
-    { "cp850",      "CP850" },
-    { "dechanyu",   "DEC-HANYU" },
-    { "dechanzi",   "GB2312" },
-    { "deckanji",   "DEC-KANJI" },
-    { "deckorean",  "EUC-KR" },
-    { "eucJP",      "EUC-JP" },
-    { "eucKR",      "EUC-KR" },
-    { "eucTW",      "EUC-TW" },
-    { "sdeckanji",  "EUC-JP" }
-#   define alias_table_defined
-#  endif
 #  if defined __sun                                         /* Solaris */
     { "5601",        "EUC-KR" },
     { "646",         "ASCII" },

diff --git a/lib/localcharset.h b/lib/localcharset.h
index 25e6d0993aaca96352dbc051a3ac3437e0b9a221..16e7738e18bec707df640331788f112211ded3a0 100644 (file)
--- a/lib/localcharset.h
+++ b/lib/localcharset.h
@@ -48,24 +48,24 @@ extern const char * locale_charset (void);
                                     (darwin = Mac OS X, windows = native Windows)
 
    ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin minix cygwin
-   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
-   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
+   ISO-8859-1              Y   glibc aix hpux irix solaris freebsd netbsd openbsd darwin cygwin zos
+   ISO-8859-2              Y   glibc aix hpux irix solaris freebsd netbsd openbsd darwin cygwin zos
    ISO-8859-3              Y   glibc solaris cygwin
-   ISO-8859-4              Y   hpux osf solaris freebsd netbsd openbsd darwin
-   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
+   ISO-8859-4              Y   hpux solaris freebsd netbsd openbsd darwin
+   ISO-8859-5              Y   glibc aix hpux irix solaris freebsd netbsd openbsd darwin cygwin zos
    ISO-8859-6              Y   glibc aix hpux solaris cygwin
-   ISO-8859-7              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
-   ISO-8859-8              Y   glibc aix hpux osf solaris cygwin zos
-   ISO-8859-9              Y   glibc aix hpux irix osf solaris freebsd darwin cygwin zos
+   ISO-8859-7              Y   glibc aix hpux irix solaris freebsd netbsd openbsd darwin cygwin zos
+   ISO-8859-8              Y   glibc aix hpux solaris cygwin zos
+   ISO-8859-9              Y   glibc aix hpux irix solaris freebsd darwin cygwin zos
    ISO-8859-13                 glibc hpux solaris freebsd netbsd openbsd darwin cygwin
    ISO-8859-14                 glibc cygwin
-   ISO-8859-15                 glibc aix irix osf solaris freebsd netbsd openbsd darwin cygwin
+   ISO-8859-15                 glibc aix irix solaris freebsd netbsd openbsd darwin cygwin
    KOI8-R                  Y   glibc hpux solaris freebsd netbsd openbsd darwin
    KOI8-U                  Y   glibc freebsd netbsd openbsd darwin cygwin
    KOI8-T                      glibc
    CP437                       dos
    CP775                       dos
-   CP850                       aix osf dos
+   CP850                       aix dos
    CP852                       dos
    CP855                       dos
    CP856                       aix
@@ -80,7 +80,7 @@ extern const char * locale_charset (void);
    CP922                       aix
    CP932                       aix cygwin windows dos
    CP943                       aix zos
-   CP949                       osf darwin windows dos
+   CP949                       darwin windows dos
    CP950                       windows dos
    CP1046                      aix
    CP1124                      aix
@@ -96,16 +96,16 @@ extern const char * locale_charset (void);
    CP1256                      windows
    CP1257                      windows
    GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin cygwin zos
-   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
-   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin zos
-   EUC-TW                      glibc aix hpux irix osf solaris netbsd
-   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin cygwin zos
+   EUC-JP                  Y   glibc aix hpux irix solaris freebsd netbsd darwin cygwin
+   EUC-KR                  Y   glibc aix hpux irix solaris freebsd netbsd darwin cygwin zos
+   EUC-TW                      glibc aix hpux irix solaris netbsd
+   BIG5                    Y   glibc aix hpux solaris freebsd netbsd darwin cygwin zos
    BIG5-HKSCS                  glibc hpux solaris netbsd darwin
-   GBK                         glibc aix osf solaris freebsd darwin cygwin windows dos
+   GBK                         glibc aix solaris freebsd darwin cygwin windows dos
    GB18030                     glibc hpux solaris freebsd netbsd darwin
-   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
+   SHIFT_JIS               Y   hpux solaris freebsd netbsd darwin
    JOHAB                       solaris windows
-   TIS-620                     glibc aix hpux osf solaris cygwin zos
+   TIS-620                     glibc aix hpux solaris cygwin zos
    ARMSCII-8                   glibc freebsd netbsd darwin
    GEORGIAN-PS                 glibc cygwin
    PT154                       glibc netbsd cygwin
@@ -115,9 +115,9 @@ extern const char * locale_charset (void);
    HP-HEBREW8                  hpux
    HP-TURKISH8                 hpux
    HP-KANA8                    hpux
-   DEC-KANJI                   osf
-   DEC-HANYU                   osf
-   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin cygwin zos
+   DEC-KANJI                   vms
+   DEC-HANYU                   vms
+   UTF-8                   Y   glibc aix hpux solaris netbsd darwin cygwin zos
 
    Note: Names which are not marked as being a MIME name should not be used in
    Internet protocols for information interchange (mail, news, etc.).