[git commit] Move include <shadow.h> close to pwd.h and grp.h includes
Denys Vlasenko
vda.linux at googlemail.com
Sun Jan 8 15:13:55 UTC 2012
commit: http://git.busybox.net/busybox/commit/?id=3e0c428c45fdb7ec51bd3c8ee1f072385d2e62ac
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
include/libbb.h | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/libbb.h b/include/libbb.h
index 5e957fb..0c266dc 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -53,6 +53,14 @@
#include <sys/param.h>
#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
+ * header as the toolchain may not provide it at all.
+ */
+# include <shadow.h>
+# endif
+#endif
#if defined(ANDROID) || defined(__ANDROID__)
# define endpwent() ((void)0)
# define endgrent() ((void)0)
@@ -86,14 +94,6 @@
#ifdef DMALLOC
# include <dmalloc.h>
#endif
-#if ENABLE_FEATURE_SHADOWPASSWDS
-# if !ENABLE_USE_BB_SHADOW
-/* If using busybox's shadow implementation, do not include the shadow.h
- * header as the toolchain may not provide it at all.
- */
-# include <shadow.h>
-# endif
-#endif
/* Just in case libc doesn't define some of these... */
#ifndef _PATH_PASSWD
#define _PATH_PASSWD "/etc/passwd"
More information about the busybox-cvs
mailing list