external/busybox
Revision | 2eaee0e3194691789812185ee7e5f3bc7a09197c (tree) |
---|---|
Zeit | 2019-02-27 20:02:52 |
Autor | Chih-Wei Huang <cwhuang@linu...> |
Commiter | Chih-Wei Huang |
Android: don't define functions already in BIONIC_O
@@ -32,6 +32,7 @@ char *getusershell() { return NULL; } | ||
32 | 32 | void setusershell() {} |
33 | 33 | void endusershell() {} |
34 | 34 | |
35 | +#ifndef BIONIC_O | |
35 | 36 | struct mntent *getmntent_r(FILE *fp, struct mntent *mnt, char *buf, int buflen) |
36 | 37 | { |
37 | 38 | char *tokp = NULL, *s; |
@@ -89,10 +90,8 @@ char *hasmntopt(const struct mntent *mnt, const char *opt) | ||
89 | 90 | |
90 | 91 | /* declared in grp.h, but not necessary */ |
91 | 92 | #if !ENABLE_USE_BB_PWD_GRP |
92 | -#ifndef BIONIC_O | |
93 | 93 | int setpwent() { return 0; } |
94 | -#endif | |
95 | 94 | void setgrent() {} |
96 | 95 | void endgrent() {} |
97 | 96 | #endif |
98 | - | |
97 | +#endif |
@@ -22,8 +22,10 @@ | ||
22 | 22 | |
23 | 23 | #define killpg_busybox(P, S) kill(-(P), S) |
24 | 24 | |
25 | +#if !defined(BIONIC_O) | |
25 | 26 | #define setmntent fopen |
26 | 27 | #define endmntent fclose |
28 | +#endif | |
27 | 29 | |
28 | 30 | /* defined in bionic/utmp.c */ |
29 | 31 | void endutent(void); |
@@ -83,9 +85,8 @@ char *hasmntopt(const struct mntent *, const char *); | ||
83 | 85 | /* bionic's vfork is rather broken; for now a terrible bandaid: */ |
84 | 86 | #define vfork fork |
85 | 87 | |
86 | -#if !defined(BIONIC_L) && !defined(BLOATCHECK) | |
88 | +#if defined(BIONIC_L) && !defined(BLOATCHECK) | |
87 | 89 | #define _SOCKLEN_T_DECLARED |
88 | -typedef int socklen_t; | |
89 | 90 | #endif |
90 | 91 | |
91 | 92 | /* wait3 was removed in android L */ |