diff options
| author | Denys Vlasenko | 2012-01-08 16:11:38 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2012-01-08 16:11:38 +0100 |
| commit | a76dd50ce11eda47f5f5cba1cf189833f7126e12 (patch) | |
| tree | 05352c5fe5b93ade677f4480794872ab5a37f3f9 | |
| parent | acdb0041b35e27cd03c43b25410eda5151acd2c1 (diff) | |
| download | busybox-a76dd50ce11eda47f5f5cba1cf189833f7126e12.zip busybox-a76dd50ce11eda47f5f5cba1cf189833f7126e12.tar.gz | |
Move Adroid endgrent() and endpwent() NOPS to libbb.h
They should be after includes of pwd.h and grp.h
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/libbb.h | 8 | ||||
| -rw-r--r-- | include/platform.h | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/libbb.h b/include/libbb.h index 22d2a5b..5e957fb 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -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 diff --git a/include/platform.h b/include/platform.h index 7451fb7..d79cc97 100644 --- a/include/platform.h +++ b/include/platform.h @@ -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? ------------------------------------ */ |