diff options
author | Bruno Haible <bruno@clisp.org> | 2023-01-22 12:43:06 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:51 +0100 |
commit | 6f43ec52f0b6c548a974ec46244292106fc48bfe (patch) | |
tree | 2ded94940d011fcab4af543ed665bbdff0f5ec76 /m4/mkostemps.m4 | |
parent | facb752a0f9b4d609d678791a7a9aecb580ff6e2 (diff) | |
download | gnulib-6f43ec52f0b6c548a974ec46244292106fc48bfe.tar.gz |
Resolve conflicts for functions introduced in Android API level 23.
* lib/stdlib.in.h (mkostemp): Consider REPLACE_MKOSTEMP. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
(mkostemps): Consider REPLACE_MKOSTEMPS. Disable _GL_CXXALIASWARN
invocation on non-glibc systems.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE_MKOSTEMP,
REPLACE_MKOSTEMPS.
* modules/stdlib (Makefile.am): Substitute REPLACE_MKOSTEMP,
REPLACE_MKOSTEMPS.
* m4/mkostemp.m4 (gl_FUNC_MKOSTEMP): Conditionally set REPLACE_MKOSTEMP.
* modules/mkostemp (Depends-on, configure.ac): Consider
REPLACE_MKOSTEMP.
* m4/mkostemps.m4 (gl_FUNC_MKOSTEMPS): Conditionally set
REPLACE_MKOSTEMPS.
* modules/mkostemps (Depends-on, configure.ac): Consider
REPLACE_MKOSTEMPS.
Diffstat (limited to 'm4/mkostemps.m4')
-rw-r--r-- | m4/mkostemps.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/mkostemps.m4 b/m4/mkostemps.m4 index fdf6971496..2ce47d130f 100644 --- a/m4/mkostemps.m4 +++ b/m4/mkostemps.m4 @@ -1,4 +1,4 @@ -# mkostemps.m4 serial 3 +# mkostemps.m4 serial 4 dnl Copyright (C) 2009-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, @@ -14,5 +14,8 @@ AC_DEFUN([gl_FUNC_MKOSTEMPS], gl_CHECK_FUNCS_ANDROID([mkostemps], [[#include <stdlib.h>]]) if test $ac_cv_func_mkostemps != yes; then HAVE_MKOSTEMPS=0 + case "$gl_cv_onwards_func_mkostemps" in + future*) REPLACE_MKOSTEMPS=1 ;; + esac fi ]) |