From: Bruno Haible <bruno@clisp.org> Date: Tue, 3 Apr 2007 00:50:15 +0000 (+0000) Subject: Handle collision with EX_OK from IRIX <unistd.h>. X-Git-Tag: cvs-readonly~603 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=3987d9cea1785abddfd3141e4ea79e7e93dee12d;p=gnulib.git Handle collision with EX_OK from IRIX <unistd.h>. --- diff --git a/ChangeLog b/ChangeLog index b49f1492ba..d67dcdc0ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-02 Bruno Haible <bruno@clisp.org> + + * lib/sysexit_.h (EX_OK): Disable the EX_OK definition from <unistd.h> + on IRIX. + 2007-04-02 Bruno Haible <bruno@clisp.org> * m4/intdiv0.m4 (gt_INTDIV0): Avoid performing the test for real on diff --git a/lib/sysexit_.h b/lib/sysexit_.h index 56a28ede45..4fa6fcf4ce 100644 --- a/lib/sysexit_.h +++ b/lib/sysexit_.h @@ -22,6 +22,14 @@ #if @HAVE_SYSEXITS_H@ +/* IRIX 6.5 has an <unistd.h> that defines a macro EX_OK with a nonzero + value. Override it. See + <http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00361.html> */ +# ifdef __sgi +# include <unistd.h> +# undef EX_OK +# endif + # include @ABSOLUTE_SYSEXITS_H@ /* HP-UX 11 <sysexits.h> ends at EX_NOPERM. */