>From fef91f09672dc691664dca0c559842ab35a5796b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 3 Jan 2023 17:14:33 +0100 Subject: [PATCH 2/2] stdio: Fix error in C++ mode on Android, due to putw. * lib/stdio.in.h (putw): Don't declare in the C++ namespace if putw is not declared. * m4/stdio_h.m4 (gl_STDIO_H): Test whether putw is declared. (gl_STDIO_H_DEFAULTS): Initialize HAVE_DECL_PUTW. * modules/stdio (Makefile.am): Substitute HAVE_DECL_PUTW. * doc/glibc-functions/putw.texi: Update regarding Android. --- ChangeLog | 10 ++++++++++ doc/glibc-functions/putw.texi | 3 +++ lib/stdio.in.h | 4 ++++ m4/stdio_h.m4 | 8 +++++++- modules/stdio | 1 + 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e73c76550f..88d5faa592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2023-01-03 Bruno Haible + + stdio: Fix error in C++ mode on Android, due to putw. + * lib/stdio.in.h (putw): Don't declare in the C++ namespace if putw is + not declared. + * m4/stdio_h.m4 (gl_STDIO_H): Test whether putw is declared. + (gl_STDIO_H_DEFAULTS): Initialize HAVE_DECL_PUTW. + * modules/stdio (Makefile.am): Substitute HAVE_DECL_PUTW. + * doc/glibc-functions/putw.texi: Update regarding Android. + 2023-01-03 Bruno Haible stdio: Fix error in C++ mode on Android, due to getw. diff --git a/doc/glibc-functions/putw.texi b/doc/glibc-functions/putw.texi index 8591c43900..18383e321f 100644 --- a/doc/glibc-functions/putw.texi +++ b/doc/glibc-functions/putw.texi @@ -23,4 +23,7 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize +@item +This function is not declared on some platforms: +Android 9.0. @end itemize diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 462762fe45..8b5ef4bd2d 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1194,9 +1194,13 @@ _GL_CXXALIASWARN (puts); # endif _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream)); # else +# if @HAVE_DECL_PUTW@ _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream)); +# endif # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (putw); +# endif #endif #if @GNULIB_REMOVE@ diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 421f594cfe..07569961f8 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 60 +# stdio_h.m4 serial 61 dnl Copyright (C) 2007-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, @@ -87,6 +87,11 @@ AC_DEFUN_ONCE([gl_STDIO_H], if test $ac_cv_have_decl_getw = no; then HAVE_DECL_GETW=0 fi + + AC_CHECK_DECLS_ONCE([putw]) + if test $ac_cv_have_decl_putw = no; then + HAVE_DECL_PUTW=0 + fi ]) # gl_STDIO_MODULE_INDICATOR([modulename]) @@ -185,6 +190,7 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE]) HAVE_DECL_GETW=1; AC_SUBST([HAVE_DECL_GETW]) HAVE_DECL_OBSTACK_PRINTF=1; AC_SUBST([HAVE_DECL_OBSTACK_PRINTF]) + HAVE_DECL_PUTW=1; AC_SUBST([HAVE_DECL_PUTW]) HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF]) HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF]) HAVE_DPRINTF=1; AC_SUBST([HAVE_DPRINTF]) diff --git a/modules/stdio b/modules/stdio index 6504a01372..b8662ef0a9 100644 --- a/modules/stdio +++ b/modules/stdio @@ -132,6 +132,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ + -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \ -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ -- 2.34.1