From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 15 Nov 2010 06:27:41 +0000 (-0800)
Subject: * src/process.c: Include <sys/ioctl.h> unconditionally,
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~238
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0e1af4627caf44e4f57147c8901991c79b65ea1;p=emacs.git

* src/process.c: Include <sys/ioctl.h> unconditionally,
keyboard.c already does it.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bef5242c9cb..912e9ae27cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/process.c b/src/process.c
index e1515065957..c38b94a9cb1 100644
--- a/src/process.c
+++ b/src/process.c
@@ -56,12 +56,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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>