modules: Fix struct namespace collision on Solaris

2 files changed, 11 insertions, 11 deletions

diff --git a/src/modules/bluetooth/module-bluez4-discover.c b/src/modules/bluetooth/module-bluez4-discover.c
index e09ecbafc..e39036a6b 100644
--- a/src/modules/bluetooth/module-bluez4-discover.c
+++ b/src/modules/bluetooth/module-bluez4-discover.c
@@ -58,13 +58,13 @@ struct userdata {
     pa_hashmap *hashmap;
 };
 
-struct module_info {
+struct pa_module_info {
     char *path;
     uint32_t module;
 };
 
 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(d);
@@ -97,7 +97,7 @@ static pa_hook_result_t load_module_for_device(pa_bluez4_discovery *y, const pa_
             pa_xfree(args);
 
             if (m) {
-                mi = pa_xnew(struct module_info, 1);
+                mi = pa_xnew(struct pa_module_info, 1);
                 mi->module = m->index;
                 mi->path = pa_xstrdup(d->path);
 
@@ -175,7 +175,7 @@ void pa__done(pa_module* m) {
         pa_bluez4_discovery_unref(u->discovery);
 
     if (u->hashmap) {
-        struct module_info *mi;
+        struct pa_module_info *mi;
 
         while ((mi = pa_hashmap_steal_first(u->hashmap))) {
             pa_xfree(mi->path);
diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c
index fa5788cfa..1e1b8555e 100644
--- a/src/modules/gconf/module-gconf.c
+++ b/src/modules/gconf/module-gconf.c
@@ -56,7 +56,7 @@ struct module_item {
     uint32_t index;
 };
 
-struct module_info {
+struct pa_module_info {
     struct userdata *userdata;
     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;
 
     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;
 }
 
-static void unload_all_modules(struct module_info *m) {
+static void unload_all_modules(struct pa_module_info *m) {
     unsigned i;
 
     pa_assert(m);
@@ -160,7 +160,7 @@ static void unload_all_modules(struct module_info *m) {
 }
 
 static void load_module(
-        struct module_info *m,
+        struct pa_module_info *m,
         unsigned i,
         const char *name,
         const char *args,
@@ -199,7 +199,7 @@ static void load_module(
 }
 
 static void module_info_free(void *p) {
-    struct module_info *m = p;
+    struct pa_module_info *m = p;
 
     pa_assert(m);
 
@@ -227,14 +227,14 @@ static int handle_event(struct userdata *u) {
 
             case '+': {
                 char *name;
-                struct module_info *m;
+                struct pa_module_info *m;
                 unsigned i, j;
 
                 if (!(name = read_string(u)))
                     goto fail;
 
                 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->name = name;
                     m->n_items = 0;