[Groff-commit] groff ./ChangeLog src/include/lib.h

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/06/22 04:56:57

Modified files:
        .              : ChangeLog 
        src/include    : lib.h 

Log message:
        * src/include/lib.h: Provide a fix for Mac OS X to not include
        groff-getopt.h.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.835&tr2=1.836&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/lib.h.diff?tr1=1.38&tr2=1.39&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.835 groff/ChangeLog:1.836
--- groff/ChangeLog:1.835       Tue Jun 21 05:54:04 2005
+++ groff/ChangeLog     Wed Jun 22 04:56:56 2005
@@ -1,4 +1,9 @@
-2005-06-20  Denis M, Wilson  address@hidden
+2005-06-21  Werner LEMBERG  <address@hidden>
+
+       * src/include/lib.h: Provide a fix for Mac OS X to not include
+       groff-getopt.h.
+
+2005-06-20  Denis M. Wilson  <address@hidden>
 
        * font/devps/prologue.ps (EP): Dont' use `bind'.  Reason: Using
        `bind' to define a procedure which contains `showpage' means that an
Index: groff/src/include/lib.h
diff -u groff/src/include/lib.h:1.38 groff/src/include/lib.h:1.39
--- groff/src/include/lib.h:1.38        Thu May 26 21:01:59 2005
+++ groff/src/include/lib.h     Wed Jun 22 04:56:57 2005
@@ -33,14 +33,15 @@
 }
 
 /* stdio.h on IRIX, OSF/1, emx, UWIN, and MinGW include getopt.h */
-/* unistd.h on CYGWIN includes getopt.h */
+/* unistd.h on CYGWIN and Mac OS X include getopt.h */
 
 #if !(defined(__sgi) \
       || (defined(__osf__) && defined(__alpha)) \
       || defined(_UWIN) \
       || defined(__EMX__) \
       || defined(__CYGWIN__) \
-      || defined(__MINGW32__))
+      || defined(__MINGW32__) \
+      || defined(__APPLE__))
 #include <groff-getopt.h>
 #else
 #include <getopt.h>