diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/config.in | 3 | ||||
| -rw-r--r-- | src/sound.c | 2 | ||||
| -rw-r--r-- | src/systty.h | 2 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
8 files changed, 10 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog index b436d39e26a..57307f64637 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-23 Dan Nicolaescu <dann@ics.uci.edu> + + * configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h. + 2010-11-21 Dan Nicolaescu <dann@ics.uci.edu> * configure.in (INLINE): Do not depend on OPTIMIZE, unused. diff --git a/configure b/configure index 8bf7586dff9..f6509d87a01 100755 --- a/configure +++ b/configure @@ -14106,19 +14106,6 @@ $as_echo "#define HAVE_INET_SOCKETS 1" >>confdefs.h 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 diff --git a/configure.in b/configure.in index 784d2fb4e5b..c24b60946e9 100644 --- a/configure.in +++ b/configure.in @@ -3028,8 +3028,6 @@ dnl Fixme: Not used. Should this be HAVE_SOCKETS? [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.]) 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" |