Include <sys/ioctl.h> unconditionally.

* configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
* src/xterm.c:
* src/systty.h:
* src/sound.c: Include <sys/ioctl.h> unconditionally.

5 files changed, 6 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d9aad77fc7c..75a141dabc6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xterm.c:
+        * systty.h:
+        * sound.c: Include <sys/ioctl.h> unconditionally.
+
 2010-11-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * alloc.c (mark_maybe_object): Return early if given a Lisp
diff --git a/src/config.in b/src/config.in
index 7d6f052fd4d..b9e9d7c720d 100644
--- a/src/config.in
+++ b/src/config.in
@@ -663,9 +663,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `sysinfo' function. */
 #undef HAVE_SYSINFO
 
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #undef HAVE_SYS_MMAN_H
 
diff --git a/src/sound.c b/src/sound.c
index 3869f3a57ff..6fd23c9ad64 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -56,9 +56,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* BEGIN: Non Windows Includes */
 #ifndef WINDOWSNT
 
-#ifndef MSDOS
 #include <sys/ioctl.h>
-#endif
 
 /* FreeBSD has machine/soundcard.h.  Voxware sound driver docs mention
    sys/soundcard.h.  So, let's try whatever's there.  */
diff --git a/src/systty.h b/src/systty.h
index 9cecbab4f0e..59850e7c321 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -26,9 +26,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #endif /* not DOS_NT */
 
-#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#endif
 
 #ifdef HPUX
 #include <sys/bsdtty.h>
diff --git a/src/xterm.c b/src/xterm.c
index ed3e5dcae45..a571d025571 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -47,9 +47,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/types.h>
 #endif /* makedev */
 
-#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#endif /* ! defined (HAVE_SYS_IOCTL_H) */
 
 #include "systime.h"