diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 02:22:22 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:15 +0100 |
| commit | 8148edea8666b821663a7d29e1ea9151d9570106 (patch) | |
| tree | 32c764d2bbc7b3b2f7b6d4b6f1c8e4057df4aaf4 /lib/stdio.in.h | |
| parent | 3a1e709270f02f91e6132bbb2ef333a01bbaa7e2 (diff) | |
| download | gnulib-8148edea8666b821663a7d29e1ea9151d9570106.tar.gz | |
Resolve conflicts for functions introduced in Android API level 18.
* m4/getdelim.m4 (gl_FUNC_GETDELIM): Conditionally set REPLACE_GETDELIM.
* m4/getline.m4 (gl_FUNC_GETLINE): Conditionally set REPLACE_GETLINE.
* lib/stdio.in.h (getdelim, getline): Disable _GL_CXXALIASWARN
invocation on non-glibc systems.
Diffstat (limited to 'lib/stdio.in.h')
| -rw-r--r-- | lib/stdio.in.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 8b5ef4bd2d..e3bd60dae1 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -882,7 +882,9 @@ _GL_CXXALIAS_SYS (getdelim, ssize_t, int delimiter, FILE *restrict stream)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getdelim); +# endif #elif defined GNULIB_POSIXCHECK # undef getdelim # if HAVE_RAW_DECL_GETDELIM @@ -921,7 +923,7 @@ _GL_CXXALIAS_SYS (getline, ssize_t, (char **restrict lineptr, size_t *restrict linesize, FILE *restrict stream)); # endif -# if @HAVE_DECL_GETLINE@ +# if __GLIBC__ >= 2 && @HAVE_DECL_GETLINE@ _GL_CXXALIASWARN (getline); # endif #elif defined GNULIB_POSIXCHECK |