From f9b493638c4fa2568342146d61b214212c9193ea Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 12 Feb 2023 00:36:10 +0100 Subject: [PATCH] =?utf8?q?terminfo,=20termcap:=20Avoid=20wrong=20configure?= =?utf8?q?=20result=20with=20clang=20=E2=89=A5=2015.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit clang 15 reports an error for -Wint-conversion by default. Reported by Sam James in . * m4/terminfo.m4 (gl_TERMINFO_BODY): Avoid a -Wint-conversion warning when testing for tparam and tparm. * m4/termcap.m4 (gl_TERMCAP_BODY): Likewise. --- ChangeLog | 10 ++++++++++ m4/termcap.m4 | 8 ++++---- m4/terminfo.m4 | 8 ++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index cad14c387a..1e28b4ae97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2023-02-11 Bruno Haible + + terminfo, termcap: Avoid wrong configure result with clang ≥ 15. + clang 15 reports an error for -Wint-conversion by default. + Reported by Sam James in + . + * m4/terminfo.m4 (gl_TERMINFO_BODY): Avoid a -Wint-conversion warning + when testing for tparam and tparm. + * m4/termcap.m4 (gl_TERMCAP_BODY): Likewise. + 2023-02-11 Bruno Haible unilbrk: Don't compile unused functions outside of libunistring. diff --git a/m4/termcap.m4 b/m4/termcap.m4 index ce14890be5..86232ca997 100644 --- a/m4/termcap.m4 +++ b/m4/termcap.m4 @@ -1,5 +1,5 @@ -# termcap.m4 serial 10 -dnl Copyright (C) 2000-2022 Free Software Foundation, Inc. +# termcap.m4 serial 10.1 +dnl Copyright (C) 2000-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -250,7 +250,7 @@ AC_DEFUN([gl_TERMCAP_BODY], char * tparam (const char *, void *, int, ...); char buf; ]], - [[return tparam ("\033\133%dm", &buf, 1, 8);]])], + [[return ! tparam ("\033\133%dm", &buf, 1, 8);]])], [gl_cv_termcap_tparam=yes], [gl_cv_termcap_tparam=no]) CPPFLAGS="$gl_save_CPPFLAGS" LIBS="$gl_save_LIBS" @@ -274,7 +274,7 @@ AC_DEFUN([gl_TERMCAP_BODY], #endif char * tparm (const char *, ...); ]], - [[return tparm ("\033\133%dm", 8);]])], + [[return ! tparm ("\033\133%dm", 8);]])], [gl_cv_termcap_tparm=yes], [gl_cv_termcap_tparm=no]) CPPFLAGS="$gl_save_CPPFLAGS" LIBS="$gl_save_LIBS" diff --git a/m4/terminfo.m4 b/m4/terminfo.m4 index 4e9af63699..c75e495aa2 100644 --- a/m4/terminfo.m4 +++ b/m4/terminfo.m4 @@ -1,5 +1,5 @@ -# terminfo.m4 serial 5 -dnl Copyright (C) 2000-2022 Free Software Foundation, Inc. +# terminfo.m4 serial 5.1 +dnl Copyright (C) 2000-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -372,7 +372,7 @@ AC_DEFUN([gl_TERMINFO_BODY], char * tparam (const char *, void *, int, ...); char buf; ]], - [[return tparam ("\033\133%dm", &buf, 1, 8);]])], + [[return ! tparam ("\033\133%dm", &buf, 1, 8);]])], [gl_cv_terminfo_tparam=yes], [gl_cv_terminfo_tparam=no]) CPPFLAGS="$gl_save_CPPFLAGS" @@ -397,7 +397,7 @@ AC_DEFUN([gl_TERMINFO_BODY], #endif char * tparm (const char *, ...); ]], - [[return tparm ("\033\133%dm", 8);]])], + [[return ! tparm ("\033\133%dm", 8);]])], [gl_cv_terminfo_tparm=yes], [gl_cv_terminfo_tparm=no]) CPPFLAGS="$gl_save_CPPFLAGS" LIBS="$gl_save_LIBS" -- 2.39.5