From 3987d9cea1785abddfd3141e4ea79e7e93dee12d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 3 Apr 2007 00:50:15 +0000 Subject: [PATCH] Handle collision with EX_OK from IRIX . --- ChangeLog | 5 +++++ lib/sysexit_.h | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index b49f1492b..d67dcdc0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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 x86 or x86_64 platforms running MacOS X. Reported by Ryan Schmidt <@ryandesign.com>. diff --git a/lib/sysexit_.h b/lib/sysexit_.h index 56a28ede4..4fa6fcf4c 100644 --- 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. */ -- 2.11.0