Mercurial > emacs
changeset 111687:17d793ffe36f
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Tue, 23 Nov 2010 10:09:55 -0800 |
| parents | e8049570c647 |
| children | 7153f8068e69 |
| files | ChangeLog configure configure.in src/ChangeLog src/config.in src/sound.c src/systty.h src/xterm.c |
| diffstat | 8 files changed, 10 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 23 12:36:15 2010 -0500 +++ b/ChangeLog Tue Nov 23 10:09:55 2010 -0800 @@ -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.
--- a/configure Tue Nov 23 12:36:15 2010 -0500 +++ b/configure Tue Nov 23 10:09:55 2010 -0800 @@ -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
--- a/configure.in Tue Nov 23 12:36:15 2010 -0500 +++ b/configure.in Tue Nov 23 10:09:55 2010 -0800 @@ -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.])
--- a/src/ChangeLog Tue Nov 23 12:36:15 2010 -0500 +++ b/src/ChangeLog Tue Nov 23 10:09:55 2010 -0800 @@ -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
--- a/src/config.in Tue Nov 23 12:36:15 2010 -0500 +++ b/src/config.in Tue Nov 23 10:09:55 2010 -0800 @@ -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
--- a/src/sound.c Tue Nov 23 12:36:15 2010 -0500 +++ b/src/sound.c Tue Nov 23 10:09:55 2010 -0800 @@ -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. */