From 51e40b125fca4d48b283e535955f683dce935046 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 14 Mar 2012 05:04:18 +0000 Subject: [PATCH] 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 --- sim/ppc/ChangeLog | 4 ++++ sim/ppc/emul_unix.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 769b299..042a558 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,7 @@ +2012-03-14 Michael Haubenwallner + + * emul_unix.c (st_pad1, st_pad2, st_pad3): Undefine. + 2012-01-02 Joel Brobecker * dp-bit.c: Reformat copyright header. diff --git a/sim/ppc/emul_unix.c b/sim/ppc/emul_unix.c index 36738c4..e66d23f 100644 --- 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 */ -- 2.7.4