More header/autoconf fixes, improve winsize checking

darcs-hash:20060809225338-ac50b-7162a690e44e2272f4760723f5bf8cc135dc5952.gz

1 files changed, 8 insertions, 0 deletions

diff --git a/common.c b/common.c
index f67e904b..b693cad3 100644
--- a/common.c
+++ b/common.c
@@ -24,7 +24,15 @@ parts of fish.
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/types.h>
+
+#ifdef HAVE_SYS_TERMIOS_H
+#include <sys/termios.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
+
 #include <sys/stat.h>
 #include <unistd.h>
 #include <wctype.h>