X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fterminal-reader.c;h=96a69d7bc452ab6e934270d850168b264924907f;hb=66f1134422fb5eddf4b126c2384834640b1f183b;hp=2f11279bf428af8b24a63902ef71f1db8bf83328;hpb=b9044cf717c4c214148597a3dd1afef16020c878;p=pspp diff --git a/src/ui/terminal/terminal-reader.c b/src/ui/terminal/terminal-reader.c index 2f11279bf4..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,12 +108,15 @@ 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 @@ -138,6 +141,7 @@ rl_echo_signal_char (int sig) fflush (rl_outstream); } #endif +#endif static size_t