# HG changeset patch # User Bruno Haible # Date 1175561415 0 # Node ID 93169764276baa6cc3a06297c622bcd4b0a4cd26 # Parent 907387cee4d99b0ea74f80b1663bafaeeafd9bab Handle collision with EX_OK from IRIX . diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-02 Bruno Haible + + * lib/sysexit_.h (EX_OK): Disable the EX_OK definition from + on IRIX. + 2007-04-02 Bruno Haible * m4/intdiv0.m4 (gt_INTDIV0): Avoid performing the test for real on diff --git a/lib/sysexit_.h b/lib/sysexit_.h --- a/lib/sysexit_.h +++ b/lib/sysexit_.h @@ -22,6 +22,14 @@ #if @HAVE_SYSEXITS_H@ +/* IRIX 6.5 has an that defines a macro EX_OK with a nonzero + value. Override it. See + */ +# ifdef __sgi +# include +# undef EX_OK +# endif + # include @ABSOLUTE_SYSEXITS_H@ /* HP-UX 11 ends at EX_NOPERM. */