Require "unistd" gnulib module. Removed tests for HAVE_UNISTD_H from

source code.

diff --git a/ChangeLog b/ChangeLog
index bbf4498c83e5849fc22076736cd4a35d4d1afebb..d0800c6dade457ae6467a77730e8f164a59b14af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 20 16:32:11 2006  Ben Pfaff  <blp@gnu.org>
+
+       * Smake: Require "unistd" gnulib module.  Removed tests for
+       HAVE_UNISTD_H from source code.
+
 Sat Mar  4 13:20:56 2006  Ben Pfaff  <blp@gnu.org>
 
        * configure.ac: Get rid of pref.h.orig.

diff --git a/Smake b/Smake
index 2741599f57cadddc00983b39a636c22fb618a602..2ca1a476114442e823df979b42c59a26e7eaa85c 100644 (file)
--- a/Smake
+++ b/Smake
@@ -7,8 +7,8 @@ GNULIB_MODULES = alloca alloca-opt assert c-ctype full-read full-write  \
 gethostname getline getlogin_r getopt gettext intprops memcasecmp      \
 memchr memcmp memmem memmove memset progname readlink restrict         \
 snprintf stat-macros stdbool stpcpy strcase strcspn strerror strftime  \
-strstr strtod strtok_r strtol strtoul vsnprintf xalloc xalloc-die      \
-xreadlink xvasprintf
+strstr strtod strtok_r strtol strtoul unistd vsnprintf xalloc          \
+xalloc-die xreadlink xvasprintf
 
 all: po/POTFILES.in
        test -d m4 || mkdir m4

diff --git a/src/data/filename.c b/src/data/filename.c
index be8fddec8de27abe22d73bd091093fdb0244733f..569d185d223a1313e756cb50ac2b7f7563a7bfd8 100644 (file)
--- a/src/data/filename.c
+++ b/src/data/filename.c
@@ -41,9 +41,7 @@
 
 #ifdef unix
 #include <pwd.h>
-#if HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <sys/stat.h>
 #include "stat-macros.h"
 #endif

diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
index 823d0c47e29138950421e7103b964f8ba52b48a4..8abf052e47c3b2c6e4705d19b71292f0f352a879 100644 (file)
--- a/src/data/sys-file-writer.c
+++ b/src/data/sys-file-writer.c
@@ -27,9 +27,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <time.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>    /* Required by SunOS4. */
-#endif
+#include <unistd.h>
 #include <libpspp/alloc.h>
 #include "case.h"
 #include "dictionary.h"

diff --git a/src/language/command.c b/src/language/command.c
index 45910d84f1491da8041cf2b441980de1edc7f6b6..a85547caa00dda44d9a4c283b20304bfac03b3ba 100644 (file)
--- a/src/language/command.c
+++ b/src/language/command.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
+#include <unistd.h>
 #include <libpspp/alloc.h>
 #include <libpspp/compiler.h>
 #include <data/dictionary.h>
@@ -36,10 +37,6 @@
 #include <data/variable.h>
 #include <procedure.h>
 
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif

diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index 9e8af0a246998d55babd943e2a6de952b8de52be..c4bfef6dfc1f03d583aa6d70e0dddd6545f430a9 100644 (file)
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -26,9 +26,7 @@
 #include <stdarg.h>
 #include <time.h>
 #include <errno.h>
-#if HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <libpspp/compiler.h>
 #include <libpspp/str.h>
 

diff --git a/src/output/html.c b/src/output/html.c
index 48aead065f95f9b59dffcc2cbd5ea230edaa5208..69222f5e229b60120ca49c4c1a71a39428b8c9b8 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -25,10 +25,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <time.h>
-
-#if HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 #include <libpspp/alloc.h>
 #include <libpspp/compiler.h>

diff --git a/src/procedure.c b/src/procedure.c
index c6209af266451267a8de102df4131b22f40c40b5..58edebca6ad7dd25a67271b47c7efb3871515a13 100644 (file)
--- a/src/procedure.c
+++ b/src/procedure.c
@@ -23,9 +23,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>    /* Required by SunOS4. */
-#endif
+#include <unistd.h>
 #include <libpspp/alloc.h>
 #include <data/case.h>
 #include <data/casefile.h>