From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 27 Oct 2006 14:08:21 +0000 (+0200)
Subject: Fix build of static library
X-Git-Tag: v1.0.14rc1~11
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=c9610c024df913f34205e8ceb424a8ba598fc3e1;p=alsa-lib.git

Fix build of static library

- Add missing pcm_empty entry
- Return the array pointer instead of the first array member.
  Otherwise only the first entry is linked to the binary.
---

diff --git a/src/control/control_symbols.c b/src/control/control_symbols.c
index 72d911a4..6924921f 100644
--- a/src/control/control_symbols.c
+++ b/src/control/control_symbols.c
@@ -30,7 +30,7 @@ static const char **snd_control_open_objects[] = {
 	
 void *snd_control_open_symbols(void)
 {
-	return (void *)snd_control_open_objects[0];
+	return snd_control_open_objects;
 }
 
 #endif /* !PIC */
diff --git a/src/hwdep/hwdep_symbols.c b/src/hwdep/hwdep_symbols.c
index 89a0af84..f268e606 100644
--- a/src/hwdep/hwdep_symbols.c
+++ b/src/hwdep/hwdep_symbols.c
@@ -28,7 +28,7 @@ static const char **snd_hwdep_open_objects[] = {
 	
 void *snd_hwdep_open_symbols(void)
 {
-	return (void *)snd_hwdep_open_objects[0];
+	return snd_hwdep_open_objects;
 }
 
 #endif
diff --git a/src/pcm/pcm_symbols.c b/src/pcm/pcm_symbols.c
index d4f5f1b9..d7849449 100644
--- a/src/pcm/pcm_symbols.c
+++ b/src/pcm/pcm_symbols.c
@@ -33,6 +33,7 @@ extern const char *_snd_module_pcm_meter;
 extern const char *_snd_module_pcm_mulaw;
 extern const char *_snd_module_pcm_multi;
 extern const char *_snd_module_pcm_null;
+extern const char *_snd_module_pcm_empty;
 extern const char *_snd_module_pcm_plug;
 extern const char *_snd_module_pcm_rate;
 extern const char *_snd_module_pcm_route;
@@ -56,7 +57,7 @@ static const char **snd_pcm_open_objects[] = {
 	
 void *snd_pcm_open_symbols(void)
 {
-	return (void *)snd_pcm_open_objects[0];
+	return snd_pcm_open_objects;
 }
 
 #endif /* !PIC */
diff --git a/src/rawmidi/rawmidi_symbols.c b/src/rawmidi/rawmidi_symbols.c
index a15dd572..14de0ce5 100644
--- a/src/rawmidi/rawmidi_symbols.c
+++ b/src/rawmidi/rawmidi_symbols.c
@@ -30,7 +30,7 @@ static const char **snd_rawmidi_open_objects[] = {
 	
 void *snd_rawmidi_open_symbols(void)
 {
-	return (void *)snd_rawmidi_open_objects[0];
+	return snd_rawmidi_open_objects;
 }
 
 #endif /* !PIC */
diff --git a/src/seq/seq_symbols.c b/src/seq/seq_symbols.c
index a66cac3e..c24d3e1b 100644
--- a/src/seq/seq_symbols.c
+++ b/src/seq/seq_symbols.c
@@ -28,7 +28,7 @@ static const char **snd_seq_open_objects[] = {
 	
 void *snd_seq_open_symbols(void)
 {
-	return (void *)snd_seq_open_objects[0];
+	return snd_seq_open_objects;
 }
 
 #endif /* !PIC */
diff --git a/src/timer/timer_symbols.c b/src/timer/timer_symbols.c
index f8856d19..6e19a232 100644
--- a/src/timer/timer_symbols.c
+++ b/src/timer/timer_symbols.c
@@ -40,7 +40,7 @@ static const char **snd_timer_query_open_objects[] = {
 	
 void *snd_timer_query_open_symbols(void)
 {
-	return (void *)snd_timer_query_open_objects[0];
+	return snd_timer_query_open_objects;
 }
 
 #endif /* !PIC */