# HG changeset patch
# User diego
# Date 1204364738 0
# Node ID 5eb017bb15682844a9f7bd42a24c5e259b620384
# Parent  a65168348ad5e471bff6bf8e75dab058503bbb2c
Merge two #ifdefs.

diff -r a65168348ad5 -r 5eb017bb1568 libao2/audio_out.c
--- a/libao2/audio_out.c	Sat Mar 01 09:04:00 2008 +0000
+++ b/libao2/audio_out.c	Sat Mar 01 09:45:38 2008 +0000
@@ -51,10 +51,7 @@
 #ifdef USE_OSS_AUDIO
         &audio_out_oss,
 #endif
-#ifdef HAVE_ALSA1X
-        &audio_out_alsa,
-#endif
-#ifdef HAVE_ALSA9
+#if defined (HAVE_ALSA1X) || defined (HAVE_ALSA9)
         &audio_out_alsa,
 #endif
 #ifdef HAVE_ALSA5