From 1034f7092af58fb410124c981fffa6266f8256af Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Wed, 12 Dec 2012 18:03:15 -0500 Subject: [PATCH] Wrap termio.h include in guard --- configure.ac | 1 + src/frontend/mosh-client.cc | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index aa8ca40..b299412 100644 --- a/configure.ac +++ b/configure.ac @@ -181,6 +181,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h langinfo.h limits.h locale.h netinet/in.h AC_CHECK_HEADERS([pty.h util.h libutil.h paths.h]) AC_CHECK_HEADERS([endian.h sys/endian.h]) AC_CHECK_HEADERS([utmpx.h]) +AC_CHECK_HEADERS([termio.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc index 3064187..e03f7d1 100644 --- a/src/frontend/mosh-client.cc +++ b/src/frontend/mosh-client.cc @@ -41,12 +41,16 @@ #include "locale_utils.h" #include "fatal_assert.h" -/* these need to be included last because of conflicting defines */ +/* These need to be included last because of conflicting defines. */ /* - * stmclient.h includes termios.h, and that will break termio/termios pull in on solaris - * solution is to include termio.h allso. + * stmclient.h includes termios.h, and that will break termio/termios pull in on Solaris. + * The solution is to include termio.h also. + * But Mac OS X doesn't have termio.h, so this needs a guard. */ +#ifdef HAVE_TERMIO_H #include +#endif + #if defined HAVE_NCURSESW_CURSES_H # include #elif defined HAVE_NCURSESW_H