Handle collision with EX_OK from IRIX <unistd.h>.

diff --git a/ChangeLog b/ChangeLog
index b49f1492bad1982ae94ea683c29a8473fb77cd48..d67dcdc0ae5e5bc917b6df4e48fd899b97322354 100644 (file)
--- 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 56a28ede4524affe3b8c6467a8374ecf6dc39d91..4fa6fcf4ce730c687604ee175bd8b1c6fce6ff2b 100644 (file)
--- 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.  */