975c71418
Denys Vlasenko
2011-01-24
Subject
nicer looking ifdef in libbb/makedev.c
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+1 -1
| @@ -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 | |
libbb/makedev.c+10 -9
| @@ -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); | |
| } | |