X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fterminal-reader.c;h=96a69d7bc452ab6e934270d850168b264924907f;hb=d2b769f76cbbadede9bd68da7caecabd69235bfa;hp=b4eae73add6b59e375d4fce089be9cc5c16ce0c4;hpb=b3d9ce1c22334767f0dfd38e647dcd0c75799113;p=pspp

diff --git a/src/ui/terminal/terminal-reader.c b/src/ui/terminal/terminal-reader.c
index b4eae73add..96a69d7bc4 100644
--- a/src/ui/terminal/terminal-reader.c
+++ b/src/ui/terminal/terminal-reader.c
@@ -99,7 +99,7 @@ welcome (void)
 	 "conditions.\nThere is ABSOLUTELY NO WARRANTY for PSPP; type \"show "
 	 "warranty.\" for details.\n", stdout);
   puts (stat_version);
-  journal_enable ();
+  journal_init ();
 }
 
 static struct terminal_reader *
@@ -108,18 +108,22 @@ terminal_reader_cast (struct lex_reader *r)
   return UP_CAST (r, struct terminal_reader, reader);
 }
 
+
 /* Older libreadline versions do not provide rl_outstream.
    However, it is almost always going to be the same as stdout. */
 #if ! HAVE_RL_OUTSTREAM
 # define rl_outstream stdout
 #endif
 
+
+#if HAVE_READLINE
 /* Similarly, rl_echo_signal_char is fairly recent.
    We provide our own crude version if it is not present. */
 #if ! HAVE_RL_ECHO_SIGNAL_CHAR
 static void
 rl_echo_signal_char (int sig)
 {
+#if HAVE_TERMIOS_H
   struct termios t;
   if (0 == tcgetattr (0, &t))
     {
@@ -131,11 +135,13 @@ rl_echo_signal_char (int sig)
 	fprintf (rl_outstream, "%c", c);
     }
   else
+#endif
     fprintf (rl_outstream, "^C");
 
   fflush (rl_outstream);
 }  
 #endif
+#endif
 
 
 static size_t