lineedit: fix completion with applet names. closes 9361

[oweals/busybox.git] / libbb / makedev.c

diff --git a/libbb/makedev.c b/libbb/makedev.c
index 09ed7287d4c5a9514d90f7d9530bd4057abd824a..06c4039a3119e40f04bb9072018a98717fdb7c5c 100644 (file)
--- a/libbb/makedev.c
+++ b/libbb/makedev.c
@@ -1,18 +1,30 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 2006 Denis Vlasenko
+ * Copyright (C) 2006 Denys Vlasenko
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 /* We do not include libbb.h - #define makedev() is there! */
-#include <sys/sysmacros.h>
+#include "platform.h"
+
+/* 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>
+#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? */
-unsigned long long 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);
 }