Android: don't define functions already in BIONIC_O

diff --git a/android/android.c b/android/android.c
index 3eb3363..6820274 100644 (file)
--- a/android/android.c
+++ b/android/android.c
@@ -32,6 +32,7 @@ char *getusershell() { return NULL; }
 void setusershell() {}
 void endusershell() {}
 
+#ifndef BIONIC_O
 struct mntent *getmntent_r(FILE *fp, struct mntent *mnt, char *buf, int buflen)
 {
        char *tokp = NULL, *s;
@@ -89,10 +90,8 @@ char *hasmntopt(const struct mntent *mnt, const char *opt)
 
 /* declared in grp.h, but not necessary */
 #if !ENABLE_USE_BB_PWD_GRP
-#ifndef BIONIC_O
 int setpwent() { return 0; }
-#endif
 void setgrent() {}
 void endgrent() {}
 #endif
-
+#endif

diff --git a/include/android.h b/include/android.h
index 651f7df..676b7f6 100644 (file)
--- a/include/android.h
+++ b/include/android.h
@@ -22,8 +22,10 @@
 
 #define killpg_busybox(P, S) kill(-(P), S)
 
+#if !defined(BIONIC_O)
 #define setmntent fopen
 #define endmntent fclose
+#endif
 
 /* defined in bionic/utmp.c */
 void endutent(void);
@@ -83,9 +85,8 @@ char *hasmntopt(const struct mntent *, const char *);
 /* bionic's vfork is rather broken; for now a terrible bandaid: */
 #define vfork fork
 
-#if !defined(BIONIC_L) && !defined(BLOATCHECK)
+#if defined(BIONIC_L) && !defined(BLOATCHECK)
 #define _SOCKLEN_T_DECLARED
-typedef int socklen_t;
 #endif
 
 /* wait3 was removed in android L */