a76dd50ce
Denys Vlasenko
2012-01-08
Subject
Move Adroid endgrent() and endpwent() NOPS to libbb.h
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+6 -2
| @@ -51,6 +51,12 @@ | |
| #include <termios.h> | |
| #include <time.h> | |
| #include <sys/param.h> | |
| + | #include <pwd.h> |
| + | #include <grp.h> |
| + | #if defined(ANDROID) || defined(__ANDROID__) |
| + | # define endpwent() ((void)0) |
| + | # define endgrent() ((void)0) |
| + | #endif |
| #ifdef HAVE_MNTENT_H | |
| # include <mntent.h> | |
| #endif | |
| @@ -80,8 +86,6 @@ | |
| #ifdef DMALLOC | |
| # include <dmalloc.h> | |
| #endif | |
| - | #include <pwd.h> |
| - | #include <grp.h> |
| #if ENABLE_FEATURE_SHADOWPASSWDS | |
| # if !ENABLE_USE_BB_SHADOW | |
| /* If using busybox's shadow implementation, do not include the shadow.h | |
include/platform.h+0 -5
| @@ -334,11 +334,6 @@ typedef unsigned smalluint; | |
| # define MAXSYMLINKS SYMLOOP_MAX | |
| #endif | |
| - | #if defined(ANDROID) || defined(__ANDROID__) |
| - | # define endpwent() ((void)0) |
| - | # define endgrent() ((void)0) |
| - | #endif |
| - | |
| /* ---- Who misses what? ------------------------------------ */ | |