From a269ac443ece11402969c661efae4c13cbbdea0a Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@gnu.org>
Date: Tue, 21 Mar 2006 00:33:05 +0000
Subject: [PATCH] Require "unistd" gnulib module.  Removed tests for
 HAVE_UNISTD_H from source code.

---
 ChangeLog                  | 5 +++++
 Smake                      | 4 ++--
 src/data/filename.c        | 2 --
 src/data/sys-file-writer.c | 4 +---
 src/language/command.c     | 5 +----
 src/language/lexer/q2c.c   | 2 --
 src/output/html.c          | 3 ---
 src/procedure.c            | 4 +---
 8 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbf4498c..d0800c6d 100644
--- 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 2741599f..2ca1a476 100644
--- 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 be8fddec..569d185d 100644
--- 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 823d0c47..8abf052e 100644
--- 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 45910d84..a85547ca 100644
--- 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 9e8af0a2..c4bfef6d 100644
--- 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 48aead06..69222f5e 100644
--- 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 c6209af2..58edebca 100644
--- 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>
-- 
2.30.2