From: Pavel Janík <Pavel@Janik.cz>
Date: Mon, 15 Oct 2001 20:45:55 +0000 (+0000)
Subject: Include <sys/ioctl.h> also on systems without <soundcard.h>.
X-Git-Tag: ttn-vms-21-2-B4~19413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=502150e5b8b733d803cea1d7546f4749c3678227;p=emacs.git

Include <sys/ioctl.h> also on systems without <soundcard.h>.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 36cfdc6b74e..2e878bce294 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* sound.c: Include <sys/ioctl.h> also on systems without
+        <soundcard.h>.
+
 2001-10-15  Sam Steingold  <sds@gnu.org>
 
 	* fns.c (Vafter_load_alist): Declare extern (w32 build problem).
diff --git a/src/sound.c b/src/sound.c
index 2a7be3ea86d..7cbbabc185f 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -35,6 +35,10 @@ Boston, MA 02111-1307, USA.  */
 #include <signal.h>
 #include "syssignal.h"
 
+#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.  */
 
@@ -45,7 +49,6 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/soundcard.h>
 #endif
 #ifdef HAVE_SOUNDCARD_H
-#include <sys/ioctl.h>
 #include <soundcard.h>
 #endif