[MPlayer-cvslog] r26134 - trunk/libao2/audio_out.c

[diego]

Author: diego
Date: Sat Mar  1 10:45:38 2008
New Revision: 26134

Log:
Merge two #ifdefs.


Modified:
   trunk/libao2/audio_out.c

Modified: trunk/libao2/audio_out.c
==============================================================================
--- trunk/libao2/audio_out.c	(original)
+++ trunk/libao2/audio_out.c	Sat Mar  1 10:45:38 2008
@@ -51,10 +51,7 @@ const ao_functions_t* const audio_out_dr
 #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