changeset 21852:25493c55d976

don't include unistd.h unless it is needed * octave-gui.cc, octave-qt-link.cc, defaults.cc, dirfns.cc, file-io.cc, help.cc, input.cc, oct-procbuf.cc, sighandlers.cc, syscalls.cc, toplev.cc, utils.cc, octave.cc, file-ops.cc, file-stat.cc, oct-time.cc, cmd-hist.cc, lo-cutils.c, lo-utils.cc: Don't include unistd.h. * gl2ps-print.cc, mkoctfile.in.cc: Include <sys/types.h> before including <unistd.h>.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Jun 2016 15:29:18 -0400
parents e2deba5ca08c
children 09583900661b
files libgui/src/octave-gui.cc libgui/src/octave-qt-link.cc libinterp/corefcn/defaults.cc libinterp/corefcn/dirfns.cc libinterp/corefcn/file-io.cc libinterp/corefcn/gl2ps-print.cc libinterp/corefcn/help.cc libinterp/corefcn/input.cc libinterp/corefcn/oct-procbuf.cc libinterp/corefcn/sighandlers.cc libinterp/corefcn/syscalls.cc libinterp/corefcn/toplev.cc libinterp/corefcn/utils.cc libinterp/octave.cc liboctave/system/file-ops.cc liboctave/system/file-stat.cc liboctave/system/oct-time.cc liboctave/util/cmd-hist.cc liboctave/util/lo-cutils.c liboctave/util/lo-utils.cc src/mkoctfile.in.cc
diffstat 21 files changed, 4 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/octave-gui.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libgui/src/octave-gui.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -31,9 +31,6 @@
 
 #include <iostream>
 
-#include <unistd.h>
-#include <fcntl.h>
-
 #if defined (HAVE_SYS_IOCTL_H)
 #  include <sys/ioctl.h>
 #endif
--- a/libgui/src/octave-qt-link.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libgui/src/octave-qt-link.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -44,7 +44,6 @@
 
 #include "resource-manager.h"
 
-#include <unistd.h>
 octave_qt_link::octave_qt_link (QWidget *p)
   : octave_link (), main_thread (new QThread ()),
     command_interpreter (new octave_interpreter ())
--- a/libinterp/corefcn/defaults.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/defaults.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -30,9 +30,6 @@
 #include <iostream>
 #include <string>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "dir-ops.h"
 #include "oct-env.h"
 #include "file-stat.h"
--- a/libinterp/corefcn/dirfns.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/dirfns.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -33,9 +33,6 @@
 #include <sstream>
 #include <string>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "file-ops.h"
 #include "file-stat.h"
 #include "glob-match.h"
--- a/libinterp/corefcn/file-io.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/file-io.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -48,8 +48,6 @@
 #include <vector>
 
 #include <fcntl.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #if defined (HAVE_ZLIB_H)
 #  include <zlib.h>
--- a/libinterp/corefcn/gl2ps-print.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/gl2ps-print.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -31,7 +31,10 @@
 #if defined (HAVE_GL2PS_H)
 
 #include <cstdio>
+
 #include <limits>
+
+#include <sys/types.h>
 #include <unistd.h>
 
 #include <gl2ps.h>
--- a/libinterp/corefcn/help.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/help.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -33,9 +33,6 @@
 #include <sstream>
 #include <string>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "cmd-edit.h"
 #include "file-ops.h"
 #include "file-stat.h"
--- a/libinterp/corefcn/input.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/input.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -35,9 +35,6 @@
 #include <sstream>
 #include <string>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "cmd-edit.h"
 #include "file-ops.h"
 #include "quit.h"
--- a/libinterp/corefcn/oct-procbuf.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/oct-procbuf.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -28,9 +28,6 @@
 
 #include <iostream>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "lo-mappers.h"
 #include "lo-utils.h"
 #include "oct-procbuf.h"
--- a/libinterp/corefcn/sighandlers.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/sighandlers.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -29,9 +29,6 @@
 #include <iostream>
 #include <new>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "cmd-edit.h"
 #include "oct-syscalls.h"
 #include "quit.h"
--- a/libinterp/corefcn/syscalls.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/syscalls.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -33,9 +33,6 @@
 #include <cstdio>
 #include <cstring>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include <fcntl.h>
 
 #include "cmd-hist.h"
--- a/libinterp/corefcn/toplev.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/toplev.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -36,8 +36,6 @@
 #include <string>
 
 #include <sys/select.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "cmd-edit.h"
 #include "cmd-hist.h"
--- a/libinterp/corefcn/utils.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/corefcn/utils.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -33,9 +33,6 @@
 #include <limits>
 #include <string>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "vasnprintf.h"
 
 #include "dir-ops.h"
--- a/libinterp/octave.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/libinterp/octave.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -36,8 +36,6 @@
 
 #include <fcntl.h>
 #include <getopt.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "cmd-edit.h"
 #include "f77-fcn.h"
--- a/liboctave/system/file-ops.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/liboctave/system/file-ops.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -33,8 +33,6 @@
 #include <vector>
 
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "pathmax.h"
 #include "canonicalize.h"
--- a/liboctave/system/file-stat.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/liboctave/system/file-stat.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -27,9 +27,6 @@
 #include <cerrno>
 #include <cstring>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "filemode.h"
 
 #include "file-ops.h"
--- a/liboctave/system/oct-time.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/liboctave/system/oct-time.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -29,8 +29,6 @@
 #include <ctime>
 
 #include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "strftime.h"
 
--- a/liboctave/util/cmd-hist.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/liboctave/util/cmd-hist.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -41,9 +41,6 @@
 #if defined (USE_READLINE)
 #include <cstdlib>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "oct-rl-hist.h"
 
 #include "file-stat.h"
--- a/liboctave/util/lo-cutils.c	Fri Jun 10 15:04:58 2016 -0400
+++ b/liboctave/util/lo-cutils.c	Fri Jun 10 15:29:18 2016 -0400
@@ -33,9 +33,6 @@
 #  define _XOPEN_SOURCE 1
 #endif
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
--- a/liboctave/util/lo-utils.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/liboctave/util/lo-utils.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -34,9 +34,6 @@
 #include <limits>
 #include <string>
 
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "quit.h"
 
 #include "lo-error.h"
--- a/src/mkoctfile.in.cc	Fri Jun 10 15:04:58 2016 -0400
+++ b/src/mkoctfile.in.cc	Fri Jun 10 15:29:18 2016 -0400
@@ -35,6 +35,7 @@
 #include <vector>
 #include <cstdlib>
 
+#include <sys/types.h>
 #include <unistd.h>
 
 // This mess suggested by the autoconf manual.