diff options
| author | Pavel Janík | 2001-10-15 20:45:55 +0000 |
|---|---|---|
| committer | Pavel Janík | 2001-10-15 20:45:55 +0000 |
| commit | 502150e5b8b733d803cea1d7546f4749c3678227 (patch) | |
| tree | d9affb976e1fc2e15e8d8bbb797efe250c87c678 /src | |
| parent | b56ba8de88039c79fe9f4b45505bdd7ee6eb88fd (diff) | |
| download | emacs-502150e5b8b733d803cea1d7546f4749c3678227.tar.gz emacs-502150e5b8b733d803cea1d7546f4749c3678227.zip | |
Include <sys/ioctl.h> also on systems without <soundcard.h>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/sound.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 36cfdc6b74e..2e878bce294 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-10-15 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | ||
| 2 | |||
| 3 | * sound.c: Include <sys/ioctl.h> also on systems without | ||
| 4 | <soundcard.h>. | ||
| 5 | |||
| 1 | 2001-10-15 Sam Steingold <sds@gnu.org> | 6 | 2001-10-15 Sam Steingold <sds@gnu.org> |
| 2 | 7 | ||
| 3 | * fns.c (Vafter_load_alist): Declare extern (w32 build problem). | 8 | * 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. */ | |||
| 35 | #include <signal.h> | 35 | #include <signal.h> |
| 36 | #include "syssignal.h" | 36 | #include "syssignal.h" |
| 37 | 37 | ||
| 38 | #ifndef MSDOS | ||
| 39 | #include <sys/ioctl.h> | ||
| 40 | #endif | ||
| 41 | |||
| 38 | /* FreeBSD has machine/soundcard.h. Voxware sound driver docs mention | 42 | /* FreeBSD has machine/soundcard.h. Voxware sound driver docs mention |
| 39 | sys/soundcard.h. So, let's try whatever's there. */ | 43 | sys/soundcard.h. So, let's try whatever's there. */ |
| 40 | 44 | ||
| @@ -45,7 +49,6 @@ Boston, MA 02111-1307, USA. */ | |||
| 45 | #include <sys/soundcard.h> | 49 | #include <sys/soundcard.h> |
| 46 | #endif | 50 | #endif |
| 47 | #ifdef HAVE_SOUNDCARD_H | 51 | #ifdef HAVE_SOUNDCARD_H |
| 48 | #include <sys/ioctl.h> | ||
| 49 | #include <soundcard.h> | 52 | #include <soundcard.h> |
| 50 | #endif | 53 | #endif |
| 51 | 54 | ||