diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-09-18 12:28:29 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-09-18 12:28:29 +0000 |
commit | 4e31feb4345c617adb2ba44b9be724989b63d093 (patch) | |
tree | f0c50b7b11944e51e882a2f3efd8ee2779df0b90 /polyp/client-conf.c | |
parent | 9ad4aa387ebcae2ec2b9f67f1f04eea89eddc241 (diff) |
work around gcc 2.95 limitation
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@218 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/client-conf.c')
-rw-r--r-- | polyp/client-conf.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/polyp/client-conf.c b/polyp/client-conf.c index efaae837..b8a4c778 100644 --- a/polyp/client-conf.c +++ b/polyp/client-conf.c @@ -74,16 +74,23 @@ int pa_client_conf_load(struct pa_client_conf *c, const char *filename) { char *def = NULL; int r; - const struct pa_config_item table[] = { - { "daemon-binary", pa_config_parse_string, &c->daemon_binary }, - { "extra-arguments", pa_config_parse_string, &c->extra_arguments }, - { "default-sink", pa_config_parse_string, &c->default_sink }, - { "default-source", pa_config_parse_string, &c->default_source }, - { "default-server", pa_config_parse_string, &c->default_server }, - { "autospawn", pa_config_parse_bool, &c->autospawn }, + struct pa_config_item table[] = { + { "daemon-binary", pa_config_parse_string, NULL }, + { "extra-arguments", pa_config_parse_string, NULL }, + { "default-sink", pa_config_parse_string, NULL }, + { "default-source", pa_config_parse_string, NULL }, + { "default-server", pa_config_parse_string, NULL }, + { "autospawn", pa_config_parse_bool, NULL }, { NULL, NULL, NULL }, }; + table[0].data = &c->daemon_binary; + table[1].data = &c->extra_arguments; + table[2].data = &c->default_sink; + table[3].data = &c->default_source; + table[4].data = &c->default_server; + table[5].data = &c->autospawn; + if (!filename) filename = getenv(ENV_CLIENT_CONFIG_FILE); |