mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: Fix struct namespace collision on Solaris

Browse source
This commit is contained in:
Shawn Walker 2015-07-29 08:09:41 +05:30 • committed by Arun Raghavan
parent 344770389e
commit 954503d074
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/bluetooth/module-bluez4-discover.c
View file

@ -58,13 +58,13 @@ struct userdata {
pa_hashmap *hashmap; pa_hashmap *hashmap;
}; };
struct module_info { struct pa_module_info {
char *path; char *path;
uint32_t module; uint32_t module;
}; };
static pa_hook_result_t load_module_for_device(pa_bluez4_discovery *y, const pa_bluez4_device *d, struct userdata *u) { static pa_hook_result_t load_module_for_device(pa_bluez4_discovery *y, const pa_bluez4_device *d, struct userdata *u) {
struct module_info *mi; struct pa_module_info *mi;
pa_assert(u); pa_assert(u);
pa_assert(d); pa_assert(d);
@ -97,7 +97,7 @@ static pa_hook_result_t load_module_for_device(pa_bluez4_discovery *y, const pa_
pa_xfree(args); pa_xfree(args);
if (m) { if (m) {
mi = pa_xnew(struct module_info, 1); mi = pa_xnew(struct pa_module_info, 1);
mi->module = m->index; mi->module = m->index;
mi->path = pa_xstrdup(d->path); mi->path = pa_xstrdup(d->path);
@ -175,7 +175,7 @@ void pa__done(pa_module* m) {
pa_bluez4_discovery_unref(u->discovery); pa_bluez4_discovery_unref(u->discovery);
if (u->hashmap) { if (u->hashmap) {
struct module_info *mi; struct pa_module_info *mi;
while ((mi = pa_hashmap_steal_first(u->hashmap))) { while ((mi = pa_hashmap_steal_first(u->hashmap))) {
pa_xfree(mi->path); pa_xfree(mi->path);

14
src/modules/gconf/module-gconf.c
View file

@ -56,7 +56,7 @@ struct module_item {
uint32_t index; uint32_t index;
}; };
struct module_info { struct pa_module_info {
struct userdata *userdata; struct userdata *userdata;
char *name; char *name;
@ -129,7 +129,7 @@ static char *read_string(struct userdata *u) {
} }
} }
static void unload_one_module(struct module_info *m, unsigned i) { static void unload_one_module(struct pa_module_info *m, unsigned i) {
struct userdata *u; struct userdata *u;
pa_assert(m); pa_assert(m);
@ -148,7 +148,7 @@ static void unload_one_module(struct module_info *m, unsigned i) {
m->items[i].name = m->items[i].args = NULL; m->items[i].name = m->items[i].args = NULL;
} }
static void unload_all_modules(struct module_info *m) { static void unload_all_modules(struct pa_module_info *m) {
unsigned i; unsigned i;
pa_assert(m); pa_assert(m);
@ -160,7 +160,7 @@ static void unload_all_modules(struct module_info *m) {
} }
static void load_module( static void load_module(
struct module_info *m, struct pa_module_info *m,
unsigned i, unsigned i,
const char *name, const char *name,
const char *args, const char *args,
@ -199,7 +199,7 @@ static void load_module(
} }
static void module_info_free(void *p) { static void module_info_free(void *p) {
struct module_info *m = p; struct pa_module_info *m = p;
pa_assert(m); pa_assert(m);
@ -227,14 +227,14 @@ static int handle_event(struct userdata *u) {
case '+': { case '+': {
char *name; char *name;
struct module_info *m; struct pa_module_info *m;
unsigned i, j; unsigned i, j;
if (!(name = read_string(u))) if (!(name = read_string(u)))
goto fail; goto fail;
if (!(m = pa_hashmap_get(u->module_infos, name))) { if (!(m = pa_hashmap_get(u->module_infos, name))) {
m = pa_xnew(struct module_info, 1); m = pa_xnew(struct pa_module_info, 1);
m->userdata = u; m->userdata = u;
m->name = name; m->name = name;
m->n_items = 0; m->n_items = 0;