From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 8 Jan 2012 15:13:55 +0000 (+0100)
Subject: Move include <shadow.h> close to pwd.h and grp.h includes
X-Git-Tag: 1_20_0~104
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e0c428c45fdb7ec51bd3c8ee1f072385d2e62ac;p=oweals%2Fbusybox.git

Move include <shadow.h> close to pwd.h and grp.h includes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

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 @@
 #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"