Simon Josefsson wrote: > > How about (b)? It seems the simplest. > > > >> (b) Create a replacement <sysexits.h> that does > >> > >> #include <unistd.h> > >> #undef EX_OK > >> #include </usr/include/sysexits.h> > > Yes, I think so too. ...
OK, after you both agreed, I commit this: 2007-04-02 Bruno Haible <[EMAIL PROTECTED]> * lib/sysexit_.h (EX_OK): Disable the EX_OK definition from <unistd.h> on IRIX. *** lib/sysexit_.h 30 Mar 2007 23:56:06 -0000 1.5 --- lib/sysexit_.h 3 Apr 2007 00:45:38 -0000 *************** *** 22,27 **** --- 22,35 ---- #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. */