sim: ppc: fix compilation on AIX 7.1 due to st_pad name collisions

AIX 7.1 defines st_pad[123] to st_[amc]tim.tv_pad, respectively,
breaking declaration of st_pad[123] members in struct solaris_stat.
Undefine them as this is no less terrible than other solutions (like
renaming the fields and losing the binding to Solaris' names).

From: Michael Haubenwallner <haubi@s01en24.gentoo.org>

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 769b2990e6c0dc74b8f8b21d1f12ce013f372ac7..042a5586e04773634c3720fc9929711f5f4c307f 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-14  Michael Haubenwallner  <michael.haubenwallner@salomon.at>
+
+       * emul_unix.c (st_pad1, st_pad2, st_pad3): Undefine.
+
 2012-01-02  Joel Brobecker  <brobecker@adacore.com>
 
        * dp-bit.c: Reformat copyright header.

diff --git a/sim/ppc/emul_unix.c b/sim/ppc/emul_unix.c
index 36738c4cffc29b3bbeba1764a6f1a82ebc362afe..e66d23f01147b2c8cfdc8634f00b131303ad779c 100644 (file)
--- a/sim/ppc/emul_unix.c
+++ b/sim/ppc/emul_unix.c
@@ -1034,6 +1034,11 @@ typedef  unsigned32      solaris_nlink_t;
 #ifdef HAVE_SYS_STAT_H
 #define        SOLARIS_ST_FSTYPSZ 16           /* array size for file system type name */
 
+/* AIX 7.1 defines st_pad[123] to st_[amc]tim.tv_pad, respectively */
+#undef st_pad1
+#undef st_pad2
+#undef st_pad3
+
 struct solaris_stat {
   solaris_dev_t                st_dev;
   signed32             st_pad1[3];     /* reserved for network id */