procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include <sys/ioctl.h> unconditionally.

Browse source 
* configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
* src/xterm.c:
* src/systty.h:
* src/sound.c: Include <sys/ioctl.h> unconditionally.
This commit is contained in:
Dan Nicolaescu 2010-11-23 10:09:55 -08:00
parent 6e13206c03
commit 2e8a479790
8 changed files with 10 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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.

13
configure vendored
View file

@ -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

2
configure.in
View file

@ -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.])

6
src/ChangeLog
View file

@ -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

3
src/config.in
View file

@ -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

2
src/sound.c
View file

@ -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. */

2
src/systty.h
View file

@ -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>

2
src/xterm.c
View file

@ -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"