Mercurial > emacs

changeset 111546:32e6d2b445ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/process.c: Include <sys/ioctl.h> unconditionally, keyboard.c already does it.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 14 Nov 2010 22:27:41 -0800
parents a112abc60888
children b678d49db641
files src/ChangeLog src/process.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Nov 14 22:18:50 2010 -0800
+++ b/src/ChangeLog	Sun Nov 14 22:27:41 2010 -0800
@@ -1,5 +1,8 @@
 2010-11-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* process.c: Include <sys/ioctl.h> unconditionally,
+	keyboard.c already does it.
+
 	* keyboard.c (pending_malloc_warning): Add const to match
 	definition in alloc.c.
 	(Fset_input_interrupt_mode): Simplify #ifdefs.
--- a/src/process.c	Sun Nov 14 22:18:50 2010 -0800
+++ b/src/process.c	Sun Nov 14 22:27:41 2010 -0800
@@ -56,12 +56,10 @@
 #endif
 #endif
 
-#if defined(HAVE_SYS_IOCTL_H)
 #include <sys/ioctl.h>
 #if defined(HAVE_NET_IF_H)
 #include <net/if.h>
 #endif /* HAVE_NET_IF_H */
-#endif /* HAVE_SYS_IOCTL_H */
 
 #ifdef NEED_BSDTTY
 #include <bsdtty.h>