From: Bruno Haible <bruno@clisp.org>
Date: Wed, 10 Sep 2025 21:06:21 +0000 (+0200)
Subject: btowc: Remove support for IRIX.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65196b26f1c2760a57cab926eb9763fa50837ed3;p=thirdparty%2Fgnulib.git

btowc: Remove support for IRIX.

* m4/btowc.m4 (gl_FUNC_BTOWC): Remove test of btowc (EOF).
---

diff --git a/ChangeLog b/ChangeLog
index 9956430c53..96cf836211 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+	btowc: Remove support for IRIX.
+	* m4/btowc.m4 (gl_FUNC_BTOWC): Remove test of btowc (EOF).
+
 	assert-h: Remove support for IRIX.
 	* m4/assert_h.m4 (gl_ASSERT_H): Remove workaround for IRIX.
 
diff --git a/m4/btowc.m4 b/m4/btowc.m4
index fd18db753e..d224b156de 100644
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,5 +1,5 @@
 # btowc.m4
-# serial 15
+# serial 16
 dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -54,43 +54,6 @@ changequote([,])dnl
           ])
       ])
 
-    dnl IRIX 6.5 btowc(EOF) is 0xFF, not WEOF.
-    AC_CACHE_CHECK([whether btowc(EOF) is correct],
-      [gl_cv_func_btowc_eof],
-      [
-        dnl Initial guess, used when cross-compiling or when no suitable locale
-        dnl is present.
-changequote(,)dnl
-        case "$host_os" in
-                             # Guess no on IRIX.
-          irix*)             gl_cv_func_btowc_eof="guessing no" ;;
-                             # Guess yes on native Windows.
-          mingw* | windows*) gl_cv_func_btowc_eof="guessing yes" ;;
-                             # Guess yes otherwise.
-          *)                 gl_cv_func_btowc_eof="guessing yes" ;;
-        esac
-changequote([,])dnl
-        if test $LOCALE_FR != none; then
-          AC_RUN_IFELSE(
-            [AC_LANG_SOURCE([[
-#include <locale.h>
-#include <stdio.h>
-#include <wchar.h>
-int main ()
-{
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
-    {
-      if (btowc (EOF) != WEOF)
-        return 1;
-    }
-  return 0;
-}]])],
-            [gl_cv_func_btowc_eof=yes],
-            [gl_cv_func_btowc_eof=no],
-            [:])
-        fi
-      ])
-
     dnl On mingw, in the C locale, btowc is inconsistent with mbrtowc:
     dnl mbrtowc avoids calling MultiByteToWideChar when MB_CUR_MAX is 1 and
     dnl ___lc_codepage_func() is 0, but btowc is lacking this special case.
@@ -146,10 +109,6 @@ int main ()
       *yes) ;;
       *) REPLACE_BTOWC=1 ;;
     esac
-    case "$gl_cv_func_btowc_eof" in
-      *yes) ;;
-      *) REPLACE_BTOWC=1 ;;
-    esac
     case "$gl_cv_func_btowc_consistent" in
       *yes) ;;
       *) REPLACE_BTOWC=1 ;;