procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA.

Browse source
This commit is contained in:
Paul Eggert 2012-05-09 22:00:53 -07:00
parent ff57c2ec02
commit 12959e8ec2
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-10 Paul Eggert <eggert@cs.ucla.edu>
* sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA.
2012-05-10 Dave Abrahams <dave@boostpro.com>
* filelock.c (syms_of_filelock): New boolean create-lockfiles.

7
src/sound.c
View file

@ -124,9 +124,6 @@ static int parse_sound (Lisp_Object, Lisp_Object *);
#ifndef DEFAULT_SOUND_DEVICE
#define DEFAULT_SOUND_DEVICE "/dev/dsp"
#endif
#ifndef DEFAULT_ALSA_SOUND_DEVICE
#define DEFAULT_ALSA_SOUND_DEVICE "default"
#endif
/* Structure forward declarations. */
@ -908,6 +905,10 @@ vox_write (struct sound_device *sd, const char *buffer, EMACS_INT nbytes)
/* This driver is available on GNU/Linux. */
#ifndef DEFAULT_ALSA_SOUND_DEVICE
#define DEFAULT_ALSA_SOUND_DEVICE "default"
#endif
static void
alsa_sound_perror (const char *msg, int err)
{