Clean up pref.h.orig and deal with the consequences.

[pspp] / src / getline.c

diff --git a/src/getline.c b/src/getline.c
index 5b8588c88d9d6aa5c06389152921743bc4f43513..89370b1332b3c9b5d9e50f1314bbedc78985910c 100644 (file)
--- a/src/getline.c
+++ b/src/getline.c
@@ -18,6 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
+#include "getline.h"
 #include <assert.h>
 #include <stdio.h>
 #include <errno.h>
@@ -25,8 +26,8 @@
 #include "alloc.h"
 #include "error.h"
 #include "filename.h"
-#include "getline.h"
 #include "lexer.h"
+#include "repeat.h"
 #include "settings.h"
 #include "str.h"
 #include "tab.h"
@@ -78,7 +79,7 @@ getl_initialize (void)
 void
 getl_uninitialize (void)
 {
-#if HAVE_LIBHISTORY && unix
+#if HAVE_LIBHISTORY && defined (unix)
   if (history_file)
     write_history (history_file);
 #endif
@@ -225,11 +226,11 @@ getl_add_DO_REPEAT_file (struct getl_script *file)
 }
 
 /* Display a welcoming message. */
-void
+static void
 welcome (void)
 {
   getl_welcomed = 1;
-  fputs ("PSPP is free software and you are welcome to distribute copies of"
+  fputs ("PSPP is free software and you are welcome to distribute copies of "
         "it\nunder certain conditions; type \"show copying.\" to see the "
         "conditions.\nThere is ABSOLUTELY NO WARRANTY for PSPP; type \"show "
         "warranty.\" for details.\n", stdout);
@@ -423,7 +424,7 @@ read_console (void)
 #if HAVE_LIBHISTORY
   if (!history_file)
     {
-#if unix
+#ifdef unix
       history_file = tilde_expand (HISTORY_FILE);
 #endif
       using_history ();