From 2922e180924b7abf1786a6ad14153dec036e87f7 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 1 Mar 2008 09:45:38 +0000
Subject: Merge two #ifdefs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libao2/audio_out.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'libao2/audio_out.c')

diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index f03b142bbf..9564fdd0da 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -51,10 +51,7 @@ const ao_functions_t* const audio_out_drivers[] =
 #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
-- 
cgit v1.2.3