# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1548370271 -3600
# Node ID fc1768dc2fc5276e47eb8b3975337370910aa783
# Parent  a2e861fa78d1f6a30d7306af98bfc8525659f8cd
fchownat: Fix compilation error on Android 4.3.

* lib/unistd.in.h: Include <sys/stat.h> when module 'fchownat' is in
use.
* m4/fchownat.m4 (gl_FUNC_FCHOWNAT_DEREF_BUG,
gl_FUNC_FCHOWNAT_EMPTY_FILENAME_BUG): Include also <sys/stat.h>.
* doc/posix-functions/fchownat.texi: Mention the issue.

diff -r a2e861fa78d1 -r fc1768dc2fc5 ChangeLog
--- a/ChangeLog	Wed Jan 23 05:11:54 2019 +0100
+++ b/ChangeLog	Thu Jan 24 23:51:11 2019 +0100
@@ -1,3 +1,12 @@
+2019-01-24  Bruno Haible  <bruno@clisp.org>
+
+	fchownat: Fix compilation error on Android 4.3.
+	* lib/unistd.in.h: Include <sys/stat.h> when module 'fchownat' is in
+	use.
+	* m4/fchownat.m4 (gl_FUNC_FCHOWNAT_DEREF_BUG,
+	gl_FUNC_FCHOWNAT_EMPTY_FILENAME_BUG): Include also <sys/stat.h>.
+	* doc/posix-functions/fchownat.texi: Mention the issue.
+
 2019-01-23  Bruno Haible  <bruno@clisp.org>
 
 	gnulib-tool: Support running testdirs on Android.
diff -r a2e861fa78d1 -r fc1768dc2fc5 doc/posix-functions/fchownat.texi
--- a/doc/posix-functions/fchownat.texi	Wed Jan 23 05:11:54 2019 +0100
+++ b/doc/posix-functions/fchownat.texi	Thu Jan 24 23:51:11 2019 +0100
@@ -9,6 +9,18 @@
 Portability problems fixed by Gnulib:
 @itemize
 @item
+This function is missing on some platforms:
+glibc 2.3.6, Mac OS X 10.5, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, Minix 3.1.8,
+AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Cygwin 1.5.x, mingw, MSVC 14, Interix 3.5, BeOS.
+But the replacement function is not safe to be used in libraries and
+is not multithread-safe.  Also, the replacement may fail to change
+symlinks if @code{lchown} is unsupported, or fail altogether if
+@code{chown} is unsupported.
+@item
+This function is declared in @code{<sys/stat.h>}, not in @code{<unistd.h>},
+on some platforms:
+Android 4.3.
+@item
 Some platforms fail to detect trailing slash on non-directories, as in
 @code{fchown(dir,"link-to-file/",uid,gid,flag)}:
 Solaris 9.
@@ -19,14 +31,6 @@
 @item
 This function does not fail for an empty filename on some platforms:
 Linux with glibc < 2.11.
-@item
-This function is missing on some platforms:
-glibc 2.3.6, Mac OS X 10.5, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, Minix 3.1.8,
-AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Cygwin 1.5.x, mingw, MSVC 14, Interix 3.5, BeOS.
-But the replacement function is not safe to be used in libraries and
-is not multithread-safe.  Also, the replacement may fail to change
-symlinks if @code{lchown} is unsupported, or fail altogether if
-@code{chown} is unsupported.
 @end itemize
 
 Portability problems not fixed by Gnulib:
diff -r a2e861fa78d1 -r fc1768dc2fc5 lib/unistd.in.h
--- a/lib/unistd.in.h	Wed Jan 23 05:11:54 2019 +0100
+++ b/lib/unistd.in.h	Thu Jan 24 23:51:11 2019 +0100
@@ -113,6 +113,13 @@
 # include <netdb.h>
 #endif
 
+/* Android 4.3 declares fchownat in <sys/stat.h>, not in <unistd.h>.  */
+/* But avoid namespace pollution on glibc systems.  */
+#if (@GNULIB_FCHOWNAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \
+    && !defined __GLIBC__
+# include <sys/stat.h>
+#endif
+
 /* MSVC defines off_t in <sys/types.h>.
    May also define off_t to a 64-bit type on native Windows.  */
 #if !@HAVE_UNISTD_H@ || @WINDOWS_64_BIT_OFF_T@
diff -r a2e861fa78d1 -r fc1768dc2fc5 m4/fchownat.m4
--- a/m4/fchownat.m4	Wed Jan 23 05:11:54 2019 +0100
+++ b/m4/fchownat.m4	Thu Jan 24 23:51:11 2019 +0100
@@ -1,4 +1,4 @@
-# fchownat.m4 serial 2
+# fchownat.m4 serial 3
 dnl Copyright (C) 2004-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -56,6 +56,8 @@
           [[
 #include <fcntl.h>
 #include <unistd.h>
+/* Android 4.3 declares fchownat() in <sys/stat.h> instead.  */
+#include <sys/stat.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -86,6 +88,8 @@
        [AC_LANG_PROGRAM(
           [[#include <unistd.h>
             #include <fcntl.h>
+            /* Android 4.3 declares fchownat() in <sys/stat.h> instead.  */
+            #include <sys/stat.h>
           ]],
           [[int fd;
             int ret;