Wrap termio.h include in guard

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

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 <termio.h>
+#endif
+
 #if defined HAVE_NCURSESW_CURSES_H
 #  include <ncursesw/curses.h>
 #elif defined HAVE_NCURSESW_H