# HG changeset patch
# User jwe
# Date 846701185 0
# Node ID f667d7ec08b9d42aa42816e520451566abae6312
# Parent  91752cdf8981af251e90c6524243bd3cd33dab79
[project @ 1996-10-30 18:46:22 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 Wed Oct 30 01:06:19 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* defaults.cc, dirfns.cc, file-io.cc, help.cc, input.cc,
+ 	oct-hist.cc, oct-procbuf.cc, oct-procbuf.h, octave.cc, pager.h,
+ 	procstream.h, pt-misc.cc, pt-plot.cc, sighandlers.cc, strftime.c,
+ 	syscalls.cc, sysdep.cc, syswait.h, toplev.cc, utils.cc,
+ 	variables.cc: Only include sys/types.h if HAVE_SYS_TYPES_H.
+
 	* error.h (panic): Use GCC_ATTR_NORETURN macro, not NORETURN.
 	* toplev.h (clean_up_and_exit): Likewise.
 	* utils.h (jump_to_top_level): Likewise.
diff --git a/src/defaults.cc b/src/defaults.cc
--- a/src/defaults.cc
+++ b/src/defaults.cc
@@ -39,7 +39,9 @@
 #include <string>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/dirfns.cc b/src/dirfns.cc
--- a/src/dirfns.cc
+++ b/src/dirfns.cc
@@ -48,7 +48,9 @@
 #include <strstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/file-io.cc b/src/file-io.cc
--- a/src/file-io.cc
+++ b/src/file-io.cc
@@ -43,7 +43,9 @@
 #include <iostream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/help.cc b/src/help.cc
--- a/src/help.cc
+++ b/src/help.cc
@@ -34,7 +34,9 @@
 #include <strstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/input.cc b/src/input.cc
--- a/src/input.cc
+++ b/src/input.cc
@@ -48,7 +48,9 @@
 #include <iostream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/oct-hist.cc b/src/oct-hist.cc
--- a/src/oct-hist.cc
+++ b/src/oct-hist.cc
@@ -40,7 +40,9 @@
 #include <fstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/oct-procbuf.cc b/src/oct-procbuf.cc
--- a/src/oct-procbuf.cc
+++ b/src/oct-procbuf.cc
@@ -29,7 +29,9 @@
 #include <iostream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/octave.cc b/src/octave.cc
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -37,7 +37,9 @@
 #include <strstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/pt-misc.cc b/src/pt-misc.cc
--- a/src/pt-misc.cc
+++ b/src/pt-misc.cc
@@ -31,7 +31,9 @@
 #include <iostream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/pt-plot.cc b/src/pt-plot.cc
--- a/src/pt-plot.cc
+++ b/src/pt-plot.cc
@@ -37,7 +37,9 @@
 #include <strstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/sighandlers.cc b/src/sighandlers.cc
--- a/src/sighandlers.cc
+++ b/src/sighandlers.cc
@@ -30,7 +30,9 @@
 #include <iostream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/strftime.c b/src/strftime.c
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -79,7 +79,10 @@
 #endif
 
 #include <stdio.h>
+
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 
 #if defined(TIME_WITH_SYS_TIME)
 #include <sys/time.h>
diff --git a/src/syscalls.cc b/src/syscalls.cc
--- a/src/syscalls.cc
+++ b/src/syscalls.cc
@@ -32,7 +32,9 @@
 #include <cstdio>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/sysdep.cc b/src/sysdep.cc
--- a/src/sysdep.cc
+++ b/src/sysdep.cc
@@ -43,7 +43,9 @@
 #include <iostream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/syswait.h b/src/syswait.h
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -25,7 +25,9 @@
 
 // This mess suggested by the autoconf manual.
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
diff --git a/src/toplev.cc b/src/toplev.cc
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -38,7 +38,9 @@
 #include <strstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/utils.cc b/src/utils.cc
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -35,7 +35,9 @@
 #include <strstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif
 
diff --git a/src/variables.cc b/src/variables.cc
--- a/src/variables.cc
+++ b/src/variables.cc
@@ -35,7 +35,9 @@
 #include <strstream.h>
 
 #ifdef HAVE_UNISTD_H
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <unistd.h>
 #endif