Use location of TIOCGWINSZ from autoconf manual

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>

diff --git a/configure.ac b/configure.ac
index 6355f72..2f3824c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,9 @@ AC_C_INLINE
 AC_C_VARARRAYS
 AC_C_TYPEOF
 
-AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h])
+AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h termios.h])
+
+AC_HEADER_TIOCGWINSZ
 
 XIPH_C_BSWAP32
 

diff --git a/src/flac/utils.c b/src/flac/utils.c
index f624235..9e08bf4 100644 (file)
--- a/src/flac/utils.c
+++ b/src/flac/utils.c
@@ -32,7 +32,12 @@
 #include "share/compat.h"
 #ifndef _WIN32
 #include <wchar.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_TERMIOS_H
+# include <termios.h>
+#endif
+#ifdef GWINSZ_IN_SYS_IOCTL
+# include <sys/ioctl.h>
+#endif
 #endif
 
 const char *CHANNEL_MASK_TAG = "WAVEFORMATEXTENSIBLE_CHANNEL_MASK";