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

diff --git a/src/ChangeLog b/src/ChangeLog
index d4e38f5271ca7b2b29cda94ac444b9a2b3944d29..f5b18b8d13a3fd6c18e47146d3f12b966b72d99b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/sound.c b/src/sound.c
index 5fd5bd5c0defcba4a240e4ef7c98c1afad684743..9b58c01453ae83d0c3f67a55571bae80d16c9c91 100644 (file)
--- 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)
 {