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 72d911a48b40d5d73bf68f36ed0cbcad95ccbfef..6924921f12fe24fb1953b5ea380f692741c67e84 100644 (file)
--- 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 89a0af84596b3ad03cdfa0e3590ca8d783752845..f268e60689ac0f75f930c728acc676a1d6cd611a 100644 (file)
--- 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 d4f5f1b97e4b18e6a84e36ec61b63446f75ac9c6..d7849449848d733dee89c9801e90a655c845810c 100644 (file)
--- 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 a15dd5724c525f16621364a63eb6c07a06df74d9..14de0ce5f1cfa4e291e2925b585124c939ede22d 100644 (file)
--- 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 a66cac3ef3c4a21b49b8143cb51f92b893da1864..c24d3e1b774cfbe25ab0af59a246318b92a8b76b 100644 (file)
--- 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 f8856d19e9e282cbddc446cc9b4b125934cf4f0a..6e19a2323d9c24516979f14e886e2be882f1c6d6 100644 (file)
--- 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 */