sys/ioctl.h vs. ioctl.h. From Sam Roberts.

diff --git a/configure.in b/configure.in
index 0a6011b5a07ec96d4076f1407bfa75bed01c81ae..0894fbc6219edee25dff2ef5e63454494db73fff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -199,7 +199,7 @@ main ()
 
 AC_HEADER_STDC
 
-AC_CHECK_HEADERS(stdarg.h sys/ioctl.h sysexits.h)
+AC_CHECK_HEADERS(stdarg.h sys/ioctl.h ioctl.h sysexits.h)
 AC_CHECK_HEADERS(sys/time.h sys/resource.h)
 AC_CHECK_HEADERS(unix.h)
 

diff --git a/resize.c b/resize.c
index c3041d8533476a15a73164e07be82f32781e710e..0b1561817b434c34f91a8c77e8ba7bed81b76839 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -26,6 +26,10 @@
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#else
+# ifdef HAVE_IOCTL_H
+# include <ioctl.h>
+# endif
 #endif
 
 /* this routine should be called after receiving SIGWINCH */