[Emacs-diffs] /srv/bzr/emacs/trunk r108186: * sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA.

[Paul Eggert]

------------------------------------------------------------
revno: 108186
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-09 22:00:53 -0700
message:
  * sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA.
modified:
  src/ChangeLog
  src/sound.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-10 00:55:57 +0000
+++ b/src/ChangeLog     2012-05-10 05:00:53 +0000
@@ -1,3 +1,7 @@
+2012-05-10  Paul Eggert  <address@hidden>
+
+       * sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA.
+
 2012-05-10  Dave Abrahams  <address@hidden>
 
        * filelock.c (syms_of_filelock): New boolean create-lockfiles.

=== modified file 'src/sound.c'
--- a/src/sound.c       2012-01-19 07:21:25 +0000
+++ b/src/sound.c       2012-05-10 05:00:53 +0000
@@ -124,9 +124,6 @@
 #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 @@
 
 /* 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)
 {