Adopt use of gnulib for portability.

[pspp-builds.git] / src / expressions / evaluate.c

diff --git a/src/expressions/evaluate.c b/src/expressions/evaluate.c
index 1607681604357b075e92ff2397ed99ca24c95f26..4331d030ff65285761e1a5cf1f50287eedd156ea 100644 (file)
--- a/src/expressions/evaluate.c
+++ b/src/expressions/evaluate.c
@@ -20,17 +20,6 @@
 #include <config.h>
 #include "private.h"
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-
 #include <ctype.h>
 #include "alloc.h"
 #include "error.h"
@@ -289,7 +278,8 @@ expr_debug_print_postfix (const struct expression *e)
           break;
         case OP_string:
           fprintf (stderr, "s<%.*s>",
-                   (int) op->string.length, op->string.string);
+                   (int) op->string.length,
+                   op->string.string != NULL ? op->string.string : "");
           break;
         case OP_format:
           fprintf (stderr, "f<%s%d.%d>",