Don't check __GNUC__ together with __USE_EXTERN_INLINES.

diff --git a/ChangeLog b/ChangeLog
index 5390435014cea01bc0add5a6c85ff0a049b6c313..21d47fe4e60851c49d342e421bf4aab24541b30b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-08  Joseph Myers  <joseph@codesourcery.com>
+
+       * io/sys/stat.h [__GNUC__ && __GNUC__ >= 2 &&
+       __USE_EXTERN_INLINES]: Change condition to [__USE_EXTERN_INLINES].
+       * sysdeps/unix/sysv/linux/sys/sysmacros.h [__GNUC__ && __GNUC__ >=
+       2 && __USE_EXTERN_INLINES]: Likewise.
+
 2013-01-08  Andreas Jaeger  <aj@suse.de>
 
        [BZ# 14985]

diff --git a/io/sys/stat.h b/io/sys/stat.h
index 8f7181a167bdec0a535738e317c24e5a60752c91..f8263d69136025a7dc523e6cc75fdbb2a18512c3 100644 (file)
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -446,7 +446,7 @@ extern int __xmknodat (int __ver, int __fd, const char *__path,
                       __mode_t __mode, __dev_t *__dev)
      __THROW __nonnull ((3, 5));
 
-#if defined __GNUC__ && __GNUC__ >= 2 && defined __USE_EXTERN_INLINES
+#ifdef __USE_EXTERN_INLINES
 /* Inlined versions of the real stat and mknod functions.  */
 
 __extern_inline int

diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index 894a631de96a461ae70ac2822ae5519a33a7388d..76eaf9f9d886ef21de14abdd60ee14ac43b167ef 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/sysmacros.h
+++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h
@@ -38,7 +38,7 @@ extern unsigned long long int gnu_dev_makedev (unsigned int __major,
                                               unsigned int __minor)
      __THROW __attribute_const__;
 
-# if defined __GNUC__ && __GNUC__ >= 2 && defined __USE_EXTERN_INLINES
+# ifdef __USE_EXTERN_INLINES
 __extension__ __extern_inline __attribute_const__ unsigned int
 __NTH (gnu_dev_major (unsigned long long int __dev))
 {