From: Chris Metcalf <cmetcalf@tilera.com>
Date: Mon, 14 May 2012 20:01:44 +0000 (-0400)
Subject: linux-generic: use "__aligned__", not "aligned", in public headers
X-Git-Tag: upstream/2.30~10627^2~124
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d45ba2bc2674697e58fb4ad618acec75a7332559;p=external%2Fglibc.git

linux-generic: use "__aligned__", not "aligned", in public headers
---

diff --git a/ChangeLog.linux-generic b/ChangeLog.linux-generic
index 4b39e61..9f563e3 100644
--- a/ChangeLog.linux-generic
+++ b/ChangeLog.linux-generic
@@ -1,3 +1,9 @@
+2012-05-14  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* sysdeps/unix/sysv/linux/generic/bits/stat.h,
+	sysdeps/unix/sysv/linux/generic/bits/statfs.h:
+	Use "__aligned__" instead of "aligned" in public headers.
+
 2012-05-12  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list:
diff --git a/sysdeps/unix/sysv/linux/generic/bits/stat.h b/sysdeps/unix/sysv/linux/generic/bits/stat.h
index f9aa66e..5de1bd0 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/stat.h
@@ -46,10 +46,10 @@
 # define __field64(type, type64, name) type name
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 # define __field64(type, type64, name) \
-  type name __attribute__((aligned(8))); int __##name##_pad
+  type name __attribute__((__aligned__(8))); int __##name##_pad
 #else
 # define __field64(type, type64, name) \
-  int __##name##_pad __attribute__((aligned(8))); type name
+  int __##name##_pad __attribute__((__aligned__(8))); type name
 #endif
 
 struct stat
diff --git a/sysdeps/unix/sysv/linux/generic/bits/statfs.h b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
index bbc5da7..bf479e8 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/statfs.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
@@ -38,10 +38,10 @@
 # define __field64(type, type64, name) type name
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 # define __field64(type, type64, name) \
-  type name __attribute__((aligned(8))); int __##name##_pad
+  type name __attribute__((__aligned__(8))); int __##name##_pad
 #else
 # define __field64(type, type64, name) \
-  int __##name##_pad __attribute__((aligned(8))); type name
+  int __##name##_pad __attribute__((__aligned__(8))); type name
 #endif
 
 struct statfs
@@ -58,7 +58,7 @@ struct statfs
     __SWORD_TYPE f_frsize;
     __SWORD_TYPE f_flags;
     __SWORD_TYPE f_spare[4];
-  } __attribute__((aligned(8)));
+  } __attribute__((__aligned__(8)));
 
 #undef __field64
 
@@ -77,7 +77,7 @@ struct statfs64
     __SWORD_TYPE f_frsize;
     __SWORD_TYPE f_flags;
     __SWORD_TYPE f_spare[4];
-  } __attribute__((aligned(8)));
+  } __attribute__((__aligned__(8)));
 #endif
 
 /* Tell code we have these members.  */