• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-c誰得cocoaqtpythonrubywindowsphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwitterdombtronvb.nettestarduinodirectxpreviewerゲームエンジン

external/busybox


Commit MetaInfo

Revision2eaee0e3194691789812185ee7e5f3bc7a09197c (tree)
Time2019-02-27 20:02:52
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android: don't define functions already in BIONIC_O

Change Summary

Incremental Difference

--- a/android/android.c
+++ b/android/android.c
@@ -32,6 +32,7 @@ char *getusershell() { return NULL; }
3232 void setusershell() {}
3333 void endusershell() {}
3434
35+#ifndef BIONIC_O
3536 struct mntent *getmntent_r(FILE *fp, struct mntent *mnt, char *buf, int buflen)
3637 {
3738 char *tokp = NULL, *s;
@@ -89,10 +90,8 @@ char *hasmntopt(const struct mntent *mnt, const char *opt)
8990
9091 /* declared in grp.h, but not necessary */
9192 #if !ENABLE_USE_BB_PWD_GRP
92-#ifndef BIONIC_O
9393 int setpwent() { return 0; }
94-#endif
9594 void setgrent() {}
9695 void endgrent() {}
9796 #endif
98-
97+#endif
--- a/include/android.h
+++ b/include/android.h
@@ -22,8 +22,10 @@
2222
2323 #define killpg_busybox(P, S) kill(-(P), S)
2424
25+#if !defined(BIONIC_O)
2526 #define setmntent fopen
2627 #define endmntent fclose
28+#endif
2729
2830 /* defined in bionic/utmp.c */
2931 void endutent(void);
@@ -83,9 +85,8 @@ char *hasmntopt(const struct mntent *, const char *);
8385 /* bionic's vfork is rather broken; for now a terrible bandaid: */
8486 #define vfork fork
8587
86-#if !defined(BIONIC_L) && !defined(BLOATCHECK)
88+#if defined(BIONIC_L) && !defined(BLOATCHECK)
8789 #define _SOCKLEN_T_DECLARED
88-typedef int socklen_t;
8990 #endif
9091
9192 /* wait3 was removed in android L */