emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Adroid endgrent() and endpwent() NOPS to libbb.h

Browse Source 
They should be after includes of pwd.h and grp.h

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-01-08 16:11:38 +01:00
parent acdb0041b3
commit a76dd50ce1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/libbb.h
View File

@ -51,6 +51,12 @@
#include <termios.h> #include <termios.h>
#include <time.h> #include <time.h>
#include <sys/param.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 #ifdef HAVE_MNTENT_H
# include <mntent.h> # include <mntent.h>
#endif #endif
@ -80,8 +86,6 @@
#ifdef DMALLOC #ifdef DMALLOC
# include <dmalloc.h> # include <dmalloc.h>
#endif #endif
#include <pwd.h>
#include <grp.h>
#if ENABLE_FEATURE_SHADOWPASSWDS #if ENABLE_FEATURE_SHADOWPASSWDS
# if !ENABLE_USE_BB_SHADOW # if !ENABLE_USE_BB_SHADOW
/* If using busybox's shadow implementation, do not include the shadow.h /* If using busybox's shadow implementation, do not include the shadow.h

5
include/platform.h
View File

@ -334,11 +334,6 @@ typedef unsigned smalluint;
# define MAXSYMLINKS SYMLOOP_MAX # define MAXSYMLINKS SYMLOOP_MAX
#endif #endif
#if defined(ANDROID) || defined(__ANDROID__)
# define endpwent() ((void)0)
# define endgrent() ((void)0)
#endif
/* ---- Who misses what? ------------------------------------ */ /* ---- Who misses what? ------------------------------------ */