izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap termio.h include in guard

Browse Source
This commit is contained in:
Keith Winstein
2012-12-12 18:03:15 -05:00
parent 99dc1f93cf
commit 1034f7092a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1
View File
@@ -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([pty.h util.h libutil.h paths.h])
AC_CHECK_HEADERS([endian.h sys/endian.h]) AC_CHECK_HEADERS([endian.h sys/endian.h])
AC_CHECK_HEADERS([utmpx.h]) AC_CHECK_HEADERS([utmpx.h])
AC_CHECK_HEADERS([termio.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL AC_HEADER_STDBOOL
src/frontend/mosh-client.cc
+7 -3
View File
@@ -41,12 +41,16 @@
#include "locale_utils.h" #include "locale_utils.h"
#include "fatal_assert.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 * stmclient.h includes termios.h, and that will break termio/termios pull in on Solaris.
* solution is to include termio.h allso. * 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> #include <termio.h>
#endif
#if defined HAVE_NCURSESW_CURSES_H #if defined HAVE_NCURSESW_CURSES_H
# include <ncursesw/curses.h> # include <ncursesw/curses.h>
#elif defined HAVE_NCURSESW_H #elif defined HAVE_NCURSESW_H