Mercurial > hg > octave-lojdl > gnulib-hg

changeset 8615:93169764276b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle collision with EX_OK from IRIX <unistd.h>.
author Bruno Haible <bruno@clisp.org>
date Tue, 03 Apr 2007 00:50:15 +0000
parents 907387cee4d9
children ab5627bc78a7
files ChangeLog lib/sysexit_.h
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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.  */