diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-24 23:53:12 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-24 23:53:12 +0100 |
| commit | 975c7141831aa6bf8d9abcafd1e5a9e108a910fc (patch) | |
| tree | 25d4fc857ff84174ddbe6048b3e8f34134a1dc59 | |
| parent | 136091886e287181c6c55bbeadf7325545285416 (diff) | |
| download | busybox-975c7141831aa6bf8d9abcafd1e5a9e108a910fc.tar.gz | |
nicer looking ifdef in libbb/makedev.c
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | libbb/makedev.c | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/include/libbb.h b/include/libbb.h index e5988236d..968bdcf5a 100644 --- 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 1809fda4e..06c4039a3 100644 --- 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); } |