aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2012-05-14 16:01:44 -0400
committerChris Metcalf <cmetcalf@tilera.com>2012-05-14 16:01:44 -0400
commitd45ba2bc2674697e58fb4ad618acec75a7332559 (patch)
tree4b58aaaa1e967470ab2caa0d004a558610d4ae42
parentb55e1c1e812f1898795ac27227381f2f9442e174 (diff)
downloadglibc-d45ba2bc2674697e58fb4ad618acec75a7332559.tar.xz
glibc-d45ba2bc2674697e58fb4ad618acec75a7332559.zip
linux-generic: use "__aligned__", not "aligned", in public headers
-rw-r--r--ChangeLog.linux-generic6
-rw-r--r--sysdeps/unix/sysv/linux/generic/bits/stat.h4
-rw-r--r--sysdeps/unix/sysv/linux/generic/bits/statfs.h8
3 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog.linux-generic b/ChangeLog.linux-generic
index 4b39e61f51..9f563e3ff2 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 f9aa66ebc7..5de1bd0514 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 bbc5da786e..bf479e875e 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. */