Add prototype for prctl to fix 64 bit build break

Change-Id: I1cda84a412666d5123be274ee0be399d25d86164

diff --git a/session.c b/session.c
index e4bab37..71466ff 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1594,11 +1594,13 @@ child_close_fds(void)
        /* XXX better use close-on-exec? -markus */
        channel_close_all();
 
+#ifndef ANDROID
        /*
         * Close any extra file descriptors.  Note that there may still be
         * descriptors left by system functions.  They will be closed later.
         */
        endpwent();
+#endif
 
        /*
         * Close any extra open file descriptors so that we don't have them

diff --git a/sshd.c b/sshd.c
index 9fcecea..dd76f8e 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -1579,7 +1579,9 @@ main(int ac, char **av)
                        xfree(privsep_pw->pw_passwd);
                privsep_pw->pw_passwd = xstrdup("*");
        }
+#ifndef ANDROID
        endpwent();
+#endif
 
        /* load private host keys */
        sensitive_data.host_keys = xcalloc(options.num_host_key_files,

diff --git a/uidswap.c b/uidswap.c
index fc2d9c4..c1c01e9 100644 (file)
--- a/uidswap.c
+++ b/uidswap.c
@@ -30,7 +30,7 @@
 #ifdef ANDROID
 #include <private/android_filesystem_config.h>
 #include <sys/capability.h>
-#include <linux/prctl.h>
+#include <sys/prctl.h>
 #endif
 
 /*