diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 12:27:03 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:40 +0100 |
| commit | 5ca443e0b95097f86c466efe051221851c1bc84f (patch) | |
| tree | f6b8387451c30fc6ed628ef4292fd46f2360fa89 /m4 | |
| parent | a26916573e4d78592989c6eecbbe4081d0398d43 (diff) | |
| download | gnulib-5ca443e0b95097f86c466efe051221851c1bc84f.tar.gz | |
Resolve conflicts for functions introduced in Android API level 21.
* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Conditionally set REPLACE_STPNCPY.
* lib/string.in.h (stpncpy): Disable _GL_CXXALIASWARN invocation on
non-glibc systems.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/stpncpy.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 index c321093b66..b9850364ed 100644 --- a/m4/stpncpy.m4 +++ b/m4/stpncpy.m4 @@ -1,4 +1,4 @@ -# stpncpy.m4 serial 20 +# stpncpy.m4 serial 21 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -96,6 +96,9 @@ int main () esac else HAVE_STPNCPY=0 + case "$gl_cv_onwards_func_stpncpy" in + future*) REPLACE_STPNCPY=1 ;; + esac fi ]) |