[Pspp-cvs] pspp src/output/html.c src/language/lexer/q2c.c...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/03/21 00:33:05

Modified files:
        src/output     : html.c 
        src/language/lexer: q2c.c 
        src/language   : command.c 
        src/data       : sys-file-writer.c filename.c 
        src            : procedure.c 
        .              : Smake ChangeLog 

Log message:
        Require "unistd" gnulib module.  Removed tests for HAVE_UNISTD_H from
        source code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/html.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/q2c.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/command.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-writer.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/filename.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/procedure.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/Smake.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/ChangeLog.diff?tr1=1.46&tr2=1.47&r1=text&r2=text

Patches:
Index: pspp/ChangeLog
diff -u pspp/ChangeLog:1.46 pspp/ChangeLog:1.47
--- pspp/ChangeLog:1.46 Sat Mar  4 21:26:39 2006
+++ pspp/ChangeLog      Tue Mar 21 00:33:05 2006
@@ -1,3 +1,8 @@
+Mon Mar 20 16:32:11 2006  Ben Pfaff  <address@hidden>
+
+       * Smake: Require "unistd" gnulib module.  Removed tests for
+       HAVE_UNISTD_H from source code.
+
 Sat Mar  4 13:20:56 2006  Ben Pfaff  <address@hidden>
 
        * configure.ac: Get rid of pref.h.orig.
Index: pspp/Smake
diff -u pspp/Smake:1.22 pspp/Smake:1.23
--- pspp/Smake:1.22     Fri Mar 17 04:58:24 2006
+++ pspp/Smake  Tue Mar 21 00:33:05 2006
@@ -7,8 +7,8 @@
 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
Index: pspp/src/data/filename.c
diff -u pspp/src/data/filename.c:1.3 pspp/src/data/filename.c:1.4
--- pspp/src/data/filename.c:1.3        Wed Mar 15 03:29:10 2006
+++ pspp/src/data/filename.c    Tue Mar 21 00:33:05 2006
@@ -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
Index: pspp/src/data/sys-file-writer.c
diff -u pspp/src/data/sys-file-writer.c:1.2 pspp/src/data/sys-file-writer.c:1.3
--- pspp/src/data/sys-file-writer.c:1.2 Wed Mar 15 03:29:10 2006
+++ pspp/src/data/sys-file-writer.c     Tue Mar 21 00:33:05 2006
@@ -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"
Index: pspp/src/language/command.c
diff -u pspp/src/language/command.c:1.3 pspp/src/language/command.c:1.4
--- pspp/src/language/command.c:1.3     Wed Mar 15 03:29:10 2006
+++ pspp/src/language/command.c Tue Mar 21 00:33:05 2006
@@ -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
Index: pspp/src/language/lexer/q2c.c
diff -u pspp/src/language/lexer/q2c.c:1.4 pspp/src/language/lexer/q2c.c:1.5
--- pspp/src/language/lexer/q2c.c:1.4   Wed Mar 15 03:29:11 2006
+++ pspp/src/language/lexer/q2c.c       Tue Mar 21 00:33:05 2006
@@ -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>
 
Index: pspp/src/output/html.c
diff -u pspp/src/output/html.c:1.4 pspp/src/output/html.c:1.5
--- pspp/src/output/html.c:1.4  Wed Mar 15 03:29:11 2006
+++ pspp/src/output/html.c      Tue Mar 21 00:33:05 2006
@@ -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>
Index: pspp/src/procedure.c
diff -u pspp/src/procedure.c:1.2 pspp/src/procedure.c:1.3
--- pspp/src/procedure.c:1.2    Wed Mar 15 03:29:10 2006
+++ pspp/src/procedure.c        Tue Mar 21 00:33:05 2006
@@ -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>