*** libg++-2.6/libg++/etc/ADT-examples/genPatkey.cc-dist	Wed Jun 17 22:55:10 1992
--- libg++-2.6/libg++/etc/ADT-examples/genPatkey.cc	Fri Sep 16 10:43:32 1994
***************
*** 2,8 ****
--- 2,10 ----
  #include <stream.h>
  #include <stdlib.h>
  #include <sys/types.h>
+ #if _G_HAVE_UNISTD
  #include <unistd.h>
+ #endif
  
  main (int argc, char *argv[]) 
  {
*** libg++-2.6/libg++/src/std.h-dist	Sat Apr 30 18:56:13 1994
--- libg++-2.6/libg++/src/std.h	Fri Sep 16 10:43:32 1994
***************
*** 23,29 ****
--- 23,31 ----
  #include <defines.h>
  #include <stdlib.h>
  #include <string.h>
+ #if _G_HAVE_UNISTD
  #include <unistd.h>
+ #endif
  #include <stdio.h> 
  #include <errno.h>
  #include <fcntl.h>
*** libg++-2.6/libg++/tests/test_h.cc-dist	Sat Dec  4 18:27:54 1993
--- libg++-2.6/libg++/tests/test_h.cc	Fri Sep 16 10:43:33 1994
***************
*** 75,81 ****
--- 75,86 ----
  #include <getpagesize.h>
  #include <time.h>
  #include <math.h>
+ 
+ #ifndef apollo
+ /* Apollo SR10.3.5 memory.h and string.h are inconsistent.  */
  #include <memory.h>
+ #endif
+ 
  #include <minmax.h>
  #include <new.h>
  #include <osfcn.h>
***************
*** 90,96 ****
--- 95,103 ----
  #include <strclass.h>
  #include <string.h>
  #include <swap.h>
+ #if _G_HAVE_UNISTD
  #include <unistd.h>
+ #endif
  #include <limits.h>
  #ifdef _IO_MAGIC
  #include <istream.h>
*** libg++-2.6/libio/filedoalloc.c-dist	Fri Jul  8 17:27:54 1994
--- libg++-2.6/libio/filedoalloc.c	Fri Sep 16 10:43:34 1994
***************
*** 49,54 ****
--- 49,59 ----
  #include <stdlib.h>
  #endif
  
+ /* WJE:  Apollo lacks S_ISCHR.  */
+ #ifndef S_ISCHR
+ #define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
+ #endif
+ 
  /* If this function pointer is non-zero, we should call it.
     It's supposed to make sure _IO_cleanup gets called on exit.
     We call it from _IO_file_doallocate, since that is likely
*** libg++-2.6/libio/fileops.c-dist	Mon Jul 11 12:56:05 1994
--- libg++-2.6/libio/fileops.c	Fri Sep 16 10:43:34 1994
***************
*** 35,40 ****
--- 35,45 ----
  extern int errno;
  #endif
  
+ /* WJE:  Apollo lacks S_ISREG.  */
+ #ifndef S_ISREG
+ #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+ #endif
+ 
  /* An fstream can be in at most one of put mode, get mode, or putback mode.
     Putback mode is a variant of get mode.
  
*** libg++-2.6/libio/iofdopen.c-dist	Wed Jun 22 20:12:08 1994
--- libg++-2.6/libio/iofdopen.c	Fri Sep 16 10:43:35 1994
***************
*** 32,37 ****
--- 32,42 ----
  #define _IO_fcntl fcntl
  #endif
  
+ /* WJE:  Apollo lacks O_ACCMODE.  */
+ #ifndef O_ACCMODE
+ #define O_ACCMODE 3
+ #endif
+ 
  _IO_FILE *
  _IO_fdopen (fd, mode)
       int fd;
*** libg++-2.6/libio/iopopen.c-dist	Thu Jul 14 23:24:05 1994
--- libg++-2.6/libio/iopopen.c	Fri Sep 16 10:43:35 1994
***************
*** 28,34 ****
--- 28,36 ----
  #include "libioP.h"
  #if _IO_HAVE_SYS_WAIT
  #include <signal.h>
+ #if _G_HAVE_UNISTD
  #include <unistd.h>
+ #endif
  #ifdef __STDC__
  #include <stdlib.h>
  #endif
*** libg++-2.6/libio/tests/tFile.cc-dist	Fri May  6 16:11:39 1994
--- libg++-2.6/libio/tests/tFile.cc	Fri Sep 16 10:43:36 1994
***************
*** 33,39 ****
--- 33,41 ----
  #include <fstream.h>
  #ifndef _OLD_STREAMS
  #include <strstream.h>
+ #if _G_HAVE_UNISTD
  #include "unistd.h"
+ #endif
  #endif
  #include <SFile.h>
  #include <PlotFile.h>
