fixes for previous commit

Turns out the Travis environments are less forgiving than my system. Add
missing include. Change subsystem init order in fkr.
This commit is contained in:
Kurtis Rader
2017-06-18 15:54:13 -07:00
parent 93dad29ec6
commit 59a11188df
2 changed files with 4 additions and 1 deletions

View File

@@ -12,6 +12,9 @@
#include <string.h>
#include <termios.h>
#include <wchar.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#include <memory>
#include <sstream>

View File

@@ -281,9 +281,9 @@ static void setup_and_process_keys(bool continuous_mode) {
is_interactive_session = 1; // by definition this program is interactive
set_main_thread();
setup_fork_guards();
proc_push_interactive(1);
env_init();
reader_init();
proc_push_interactive(1);
install_our_signal_handlers();
if (continuous_mode) {