From b6b519b416189202d18d888d61d8bbe50dc30325 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 9 Apr 2001 23:52:18 +0000 Subject: Update how we detect if libc5 is in use. -Erik --- init/init.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'init') diff --git a/init/init.c b/init/init.c index bf992b52c..619421891 100644 --- a/init/init.c +++ b/init/init.c @@ -85,13 +85,13 @@ static const int RB_ENABLE_CAD = 0x89abcdef; static const int RB_DISABLE_CAD = 0; #define RB_POWER_OFF 0x4321fedc static const int RB_AUTOBOOT = 0x01234567; -#if defined(__GLIBC__) || defined (__UCLIBC__) -#include + +#if __GNU_LIBRARY__ > 5 + #include #define init_reboot(magic) reboot(magic) #else #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic) #endif -#endif #ifndef _PATH_STDPATH #define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" @@ -112,11 +112,11 @@ static const int RB_AUTOBOOT = 0x01234567; #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -#if defined(__GLIBC__) -#include +#if __GNU_LIBRARY__ > 5 + #include #else -extern int bdflush (int func, long int data); -#endif /* __GLIBC__ */ + extern int bdflush (int func, long int data); +#endif #define VT_PRIMARY "/dev/tty1" /* Primary virtual console */ -- cgit v1.2.3