diff options
| -rw-r--r-- | include/stdlib.h | 6 | ||||
| -rw-r--r-- | include/sys/sysmacros.h | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/include/stdlib.h b/include/stdlib.h index b183c0bdd..e633a5c1a 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -155,7 +155,7 @@ extern int atoi (__const char *__nptr) __THROW __attribute_pure__; extern long int atol (__const char *__nptr) __THROW __attribute_pure__; __END_NAMESPACE_STD -#if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC) +#if defined __USE_ISOC99 || defined __USE_MISC __BEGIN_NAMESPACE_C99 /* Convert a string to a long long integer. */ __extension__ extern long long int atoll (__const char *__nptr) @@ -192,7 +192,7 @@ extern unsigned long int strtoul (__const char *__restrict __nptr, __THROW; __END_NAMESPACE_C99 -#if defined __GLIBC_HAVE_LONG_LONG && defined __USE_BSD +#if defined __USE_BSD /* Convert a string to a quadword integer. */ __extension__ extern long long int strtoq (__const char *__restrict __nptr, @@ -204,7 +204,7 @@ extern unsigned long long int strtouq (__const char *__restrict __nptr, __THROW; #endif /* GCC and use BSD. */ -#if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC) +#if defined __USE_ISOC99 || defined __USE_MISC __BEGIN_NAMESPACE_C99 /* Convert a string to a quadword integer. */ __extension__ diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h index a9bfa78d3..8feb3bbea 100644 --- a/include/sys/sysmacros.h +++ b/include/sys/sysmacros.h @@ -25,7 +25,6 @@ /* If the compiler does not know long long it is out of luck. We are not going to hack weird hacks to support the dev_t representation they need. */ -#ifdef __GLIBC_HAVE_LONG_LONG __extension__ extern __inline unsigned int gnu_dev_major (unsigned long long int __dev) __THROW; @@ -37,7 +36,7 @@ extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major, unsigned int __minor) __THROW; -# if defined __GNUC__ && __GNUC__ >= 2 +#if defined __GNUC__ && __GNUC__ >= 2 __extension__ extern __inline unsigned int gnu_dev_major (unsigned long long int __dev) __THROW { @@ -57,13 +56,12 @@ gnu_dev_makedev (unsigned int __major, unsigned int __minor) __THROW | (((unsigned long long int) (__minor & ~0xff)) << 12) | (((unsigned long long int) (__major & ~0xfff)) << 32)); } -# endif +#endif /* Access the functions with their traditional names. */ -# define major(dev) gnu_dev_major (dev) -# define minor(dev) gnu_dev_minor (dev) -# define makedev(maj, min) gnu_dev_makedev (maj, min) -#endif +#define major(dev) gnu_dev_major (dev) +#define minor(dev) gnu_dev_minor (dev) +#define makedev(maj, min) gnu_dev_makedev (maj, min) #endif /* sys/sysmacros.h */ |