[Emacs-diffs] /srv/bzr/emacs/trunk r102487: Include <sys/ioctl.h> unconditionally.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 102487
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-23 10:09:55 -0800
message:
  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.
modified:
  ChangeLog
  configure
  configure.in
  src/ChangeLog
  src/config.in
  src/sound.c
  src/systty.h
  src/xterm.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-11-21 05:17:19 +0000
+++ b/ChangeLog 2010-11-23 18:09:55 +0000
@@ -1,3 +1,7 @@
+2010-11-23  Dan Nicolaescu  <address@hidden>
+
+       * configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
+
 2010-11-21  Dan Nicolaescu  <address@hidden>
 
        * configure.in (INLINE): Do not depend on OPTIMIZE, unused.

=== modified file 'configure'
--- a/configure 2010-11-21 14:39:55 +0000
+++ b/configure 2010-11-23 18:09:55 +0000
@@ -14106,19 +14106,6 @@
 
 fi
 
-for ac_header in sys/ioctl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" 
"ac_cv_header_sys_ioctl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ioctl_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_IOCTL_H 1
-_ACEOF
-
-fi
-
-done
-
-
 if test -f /usr/lpp/X11/bin/smt.exp; then
 
 $as_echo "#define HAVE_AIX_SMT_EXP 1" >>confdefs.h

=== modified file 'configure.in'
--- a/configure.in      2010-11-21 14:39:55 +0000
+++ b/configure.in      2010-11-23 18:09:55 +0000
@@ -3028,8 +3028,6 @@
            [Define to 1 if you have inet sockets.])
 fi
 
-AC_CHECK_HEADERS(sys/ioctl.h)
-
 if test -f /usr/lpp/X11/bin/smt.exp; then
   AC_DEFINE(HAVE_AIX_SMT_EXP, 1,
            [Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists.])

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-22 00:43:53 +0000
+++ b/src/ChangeLog     2010-11-23 18:09:55 +0000
@@ -1,3 +1,9 @@
+2010-11-23  Dan Nicolaescu  <address@hidden>
+
+       * xterm.c:
+       * systty.h:
+       * sound.c: Include <sys/ioctl.h> unconditionally.
+
 2010-11-22  YAMAMOTO Mitsuharu  <address@hidden>
 
        * alloc.c (mark_maybe_object): Return early if given a Lisp

=== modified file 'src/config.in'
--- a/src/config.in     2010-11-21 05:17:19 +0000
+++ b/src/config.in     2010-11-23 18:09:55 +0000
@@ -663,9 +663,6 @@
 /* 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
 

=== modified file 'src/sound.c'
--- a/src/sound.c       2010-10-01 13:56:33 +0000
+++ b/src/sound.c       2010-11-23 18:09:55 +0000
@@ -56,9 +56,7 @@
 /* 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.  */

=== modified file 'src/systty.h'
--- a/src/systty.h      2010-11-15 06:10:35 +0000
+++ b/src/systty.h      2010-11-23 18:09:55 +0000
@@ -26,9 +26,7 @@
 #include <fcntl.h>
 #endif /* not DOS_NT */
 
-#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#endif
 
 #ifdef HPUX
 #include <sys/bsdtty.h>

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-11-17 15:12:02 +0000
+++ b/src/xterm.c       2010-11-23 18:09:55 +0000
@@ -47,9 +47,7 @@
 #include <sys/types.h>
 #endif /* makedev */
 
-#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
-#endif /* ! defined (HAVE_SYS_IOCTL_H) */
 
 #include "systime.h"