emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nicer looking ifdef in libbb/makedev.c

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-01-24 23:53:12 +01:00
parent 136091886e
commit 975c714183
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -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; void reset_ino_dev_hashtable(void) FAST_FUNC;
#ifdef __GLIBC__ #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 */
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 #undef makedev
#define makedev(a,b) bb_makedev(a,b) #define makedev(a,b) bb_makedev(a,b)
#endif #endif

19
libbb/makedev.c
View File

@ -8,22 +8,23 @@
/* We do not include libbb.h - #define makedev() is there! */ /* We do not include libbb.h - #define makedev() is there! */
#include "platform.h" #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 <features.h>
# include <sys/sysmacros.h> # include <sys/sysmacros.h>
#else
# include <sys/types.h>
#endif #endif
#ifdef __GLIBC__ #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? */ /* uclibc people please check - do we need "&& !__UCLIBC__" above? */
/* suppress gcc "no previous prototype" warning */ /* 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 major, unsigned minor);
unsigned long long FAST_FUNC bb_makedev(unsigned int major, unsigned int minor) unsigned long long FAST_FUNC bb_makedev(unsigned major, unsigned minor)
{ {
return makedev(major, minor); return makedev(major, minor);
} }