[uClibc-cvs] CVS update of uClibc/include (stdlib.h sys/sysmacros.h)

[Erik Andersen]

    Date: Tuesday, July 27, 2004 @ 16:48:37
  Author: andersen
    Path: /var/cvs/uClibc/include

Modified: stdlib.h (1.42 -> 1.43) sys/sysmacros.h (1.3 -> 1.4)

Remove all reference to __GLIBC_HAVE_LONG_LONG


Index: uClibc/include/stdlib.h
diff -u uClibc/include/stdlib.h:1.42 uClibc/include/stdlib.h:1.43
--- uClibc/include/stdlib.h:1.42	Fri Sep  5 00:20:05 2003
+++ uClibc/include/stdlib.h	Tue Jul 27 16:48:36 2004
@@ -155,7 +155,7 @@
 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 @@
      __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 @@
      __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__
Index: uClibc/include/sys/sysmacros.h
diff -u uClibc/include/sys/sysmacros.h:1.3 uClibc/include/sys/sysmacros.h:1.4
--- uClibc/include/sys/sysmacros.h:1.3	Mon Jul 26 06:36:24 2004
+++ uClibc/include/sys/sysmacros.h	Tue Jul 27 16:48:36 2004
@@ -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 @@
 							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 @@
 	  | (((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 */