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 e5dae5d9ce91552d0e5b20010173c8bdd6421973..89370b1332b3c9b5d9e50f1314bbedc78985910c 100644 (file)
--- a/src/getline.c
+++ b/src/getline.c
@@ -79,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
@@ -230,7 +230,7 @@ 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);
@@ -424,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 ();