diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-01-08 16:13:55 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-01-08 16:13:55 +0100 |
| commit | 3e0c428c45fdb7ec51bd3c8ee1f072385d2e62ac (patch) | |
| tree | d20a32ea9ab61e962c834beba3b38260f25b99d4 /include | |
| parent | a76dd50ce11eda47f5f5cba1cf189833f7126e12 (diff) | |
| download | busybox-w32-3e0c428c45fdb7ec51bd3c8ee1f072385d2e62ac.tar.gz busybox-w32-3e0c428c45fdb7ec51bd3c8ee1f072385d2e62ac.tar.bz2 busybox-w32-3e0c428c45fdb7ec51bd3c8ee1f072385d2e62ac.zip | |
Move include <shadow.h> close to pwd.h and grp.h includes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/libbb.h b/include/libbb.h index 5e957fbf8..0c266dc53 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -53,6 +53,14 @@ | |||
| 53 | #include <sys/param.h> | 53 | #include <sys/param.h> |
| 54 | #include <pwd.h> | 54 | #include <pwd.h> |
| 55 | #include <grp.h> | 55 | #include <grp.h> |
| 56 | #if ENABLE_FEATURE_SHADOWPASSWDS | ||
| 57 | # if !ENABLE_USE_BB_SHADOW | ||
| 58 | /* If using busybox's shadow implementation, do not include the shadow.h | ||
| 59 | * header as the toolchain may not provide it at all. | ||
| 60 | */ | ||
| 61 | # include <shadow.h> | ||
| 62 | # endif | ||
| 63 | #endif | ||
| 56 | #if defined(ANDROID) || defined(__ANDROID__) | 64 | #if defined(ANDROID) || defined(__ANDROID__) |
| 57 | # define endpwent() ((void)0) | 65 | # define endpwent() ((void)0) |
| 58 | # define endgrent() ((void)0) | 66 | # define endgrent() ((void)0) |
| @@ -86,14 +94,6 @@ | |||
| 86 | #ifdef DMALLOC | 94 | #ifdef DMALLOC |
| 87 | # include <dmalloc.h> | 95 | # include <dmalloc.h> |
| 88 | #endif | 96 | #endif |
| 89 | #if ENABLE_FEATURE_SHADOWPASSWDS | ||
| 90 | # if !ENABLE_USE_BB_SHADOW | ||
| 91 | /* If using busybox's shadow implementation, do not include the shadow.h | ||
| 92 | * header as the toolchain may not provide it at all. | ||
| 93 | */ | ||
| 94 | # include <shadow.h> | ||
| 95 | # endif | ||
| 96 | #endif | ||
| 97 | /* Just in case libc doesn't define some of these... */ | 97 | /* Just in case libc doesn't define some of these... */ |
| 98 | #ifndef _PATH_PASSWD | 98 | #ifndef _PATH_PASSWD |
| 99 | #define _PATH_PASSWD "/etc/passwd" | 99 | #define _PATH_PASSWD "/etc/passwd" |
