Use statically-allocated thread private data

[projects/chimara/chimara.git] / libchimara / resource.c

diff --git a/libchimara/resource.c b/libchimara/resource.c
index abf0fc389c971ca8f19aa27c6c3ac53362c19741..49ef35280a369daf60aeecdf6279c81fd3cf5f58 100644 (file)
--- a/libchimara/resource.c
+++ b/libchimara/resource.c
@@ -1,6 +1,7 @@
 #include "resource.h"
+#include "stream.h"
 
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
 
 /**
  * giblorb_set_resource_map:
@@ -19,7 +20,7 @@ extern GPrivate *glk_data_key;
 giblorb_err_t
 giblorb_set_resource_map(strid_t file)
 {
-       ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+       ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
        giblorb_map_t *newmap; /* create map allocates memory */
        giblorb_err_t error = giblorb_create_map(file, &newmap);
 
@@ -38,7 +39,6 @@ giblorb_set_resource_map(strid_t file)
        glk_data->resource_map = newmap;
        glk_data->resource_file = file;
 
-       //giblorb_print_contents(newmap);
        return giblorb_err_None;
 }
 
@@ -53,8 +53,8 @@ giblorb_set_resource_map(strid_t file)
 giblorb_map_t*
 giblorb_get_resource_map()
 {
-       ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-       
+       ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
        if(glk_data->resource_map == NULL) {
                WARNING("Resource map not set yet.\n");
        }