summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-01-08 20:08:56 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-01-08 20:08:56 +0000
commiteede9df980c3e0aab8692fadc5563335f72d5278 (patch)
treea8923ab8110bee58a0e022b15c9c314f3bfc8f03
parentc40ea3d9a3be8645441967cddf14645b84af5f2c (diff)
downloadglibc-eede9df980c3e0aab8692fadc5563335f72d5278.tar.gz
Don't check __GNUC__ together with __USE_EXTERN_INLINES.
-rw-r--r--ChangeLog7
-rw-r--r--io/sys/stat.h2
-rw-r--r--sysdeps/unix/sysv/linux/sys/sysmacros.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5390435014..21d47fe4e6 100644
--- 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 8f7181a167..f8263d6913 100644
--- 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 894a631de9..76eaf9f9d8 100644
--- 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))
{