From 12959e8ec2d9a3d075f1e752be96d45817a9289d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 9 May 2012 22:00:53 -0700 Subject: [PATCH] * sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA. --- src/ChangeLog | 4 ++++ src/sound.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d4e38f5271c..f5b18b8d13a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-05-10 Paul Eggert + + * sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA. + 2012-05-10 Dave Abrahams * filelock.c (syms_of_filelock): New boolean create-lockfiles. diff --git a/src/sound.c b/src/sound.c index 5fd5bd5c0de..9b58c01453a 100644 --- a/src/sound.c +++ b/src/sound.c @@ -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) { -- 2.39.2