nicer looking ifdef in libbb/makedev.c

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

diff --git a/include/libbb.h b/include/libbb.h
index e5988236db750cf0abd6d01fb412d57797d85199..968bdcf5a451a918d13d70b81e252d5e75704911 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1297,7 +1297,7 @@ void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name) FAST
 void reset_ino_dev_hashtable(void) FAST_FUNC;
 #ifdef __GLIBC__
 /* At least glibc has horrendously large inline for this, so wrap it */
-unsigned long long bb_makedev(unsigned int major, unsigned int minor) FAST_FUNC;
+unsigned long long bb_makedev(unsigned major, unsigned minor) FAST_FUNC;
 #undef makedev
 #define makedev(a,b) bb_makedev(a,b)
 #endif

diff --git a/libbb/makedev.c b/libbb/makedev.c
index 1809fda4e29e9aa7e0df1d2208c90e26de065635..06c4039a3119e40f04bb9072018a98717fdb7c5c 100644 (file)
--- a/libbb/makedev.c
+++ b/libbb/makedev.c
@@ -8,22 +8,23 @@
 
 /* We do not include libbb.h - #define makedev() is there! */
 #include "platform.h"
-#if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
-        || defined(__APPLE__) \
-    )
+
+/* Different Unixes want different headers for makedev */
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+ || defined(__APPLE__)
+# include <sys/types.h>
+#else
 # include <features.h>
 # include <sys/sysmacros.h>
-#else
-# include <sys/types.h>
 #endif
 
 #ifdef __GLIBC__
-/* At least glibc has horrendously large inline for this, so wrap it */
+/* At least glibc has horrendously large inline for this, so wrap it. */
 /* uclibc people please check - do we need "&& !__UCLIBC__" above? */
 
-/* suppress gcc "no previous prototype" warning */
-unsigned long long FAST_FUNC bb_makedev(unsigned int major, unsigned int minor);
-unsigned long long FAST_FUNC bb_makedev(unsigned int major, unsigned int minor)
+/* Suppress gcc "no previous prototype" warning */
+unsigned long long FAST_FUNC bb_makedev(unsigned major, unsigned minor);
+unsigned long long FAST_FUNC bb_makedev(unsigned major, unsigned minor)
 {
        return makedev(major, minor);
 }