diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/sound.c | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/sound.c b/src/sound.c index 3869f3a57ff..6fd23c9ad64 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -56,9 +56,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 56 | /* BEGIN: Non Windows Includes */ | 56 | /* BEGIN: Non Windows Includes */ |
| 57 | #ifndef WINDOWSNT | 57 | #ifndef WINDOWSNT |
| 58 | 58 | ||
| 59 | #ifndef MSDOS | ||
| 60 | #include <sys/ioctl.h> | 59 | #include <sys/ioctl.h> |
| 61 | #endif | ||
| 62 | 60 | ||
| 63 | /* FreeBSD has machine/soundcard.h. Voxware sound driver docs mention | 61 | /* FreeBSD has machine/soundcard.h. Voxware sound driver docs mention |
| 64 | sys/soundcard.h. So, let's try whatever's there. */ | 62 | sys/soundcard.h. So, let's try whatever's there. */ |