--- glkloader-0.3.2/blorbfuncs.c~	2001-03-14 03:07:58.000000000 +0000
+++ glkloader-0.3.2/blorbfuncs.c	2007-12-09 11:28:31.000000000 +0000
@@ -71,3 +71,109 @@
 
     return (*funcPtr)();
 }
+
+giblorb_err_t giblorb_create_map(strid_t file, giblorb_map_t **newmap)
+{
+    giblorb_err_t (*funcPtr)(strid_t file, giblorb_map_t **newmap);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "giblorb_create_map", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(file, newmap);
+}
+
+giblorb_err_t giblorb_destroy_map(giblorb_map_t *map)
+{
+    giblorb_err_t (*funcPtr)(giblorb_map_t *map);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "giblorb_destroy_map", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(map);
+}
+
+giblorb_err_t giblorb_load_chunk_by_type(giblorb_map_t *map,
+    glui32 method, giblorb_result_t *res, glui32 chunktype, glui32 count)
+{
+    giblorb_err_t (*funcPtr)(giblorb_map_t *map,
+        glui32 method, giblorb_result_t *res, glui32 chunktype, glui32 count);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "giblorb_load_chunk_by_type", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(map, method, res, chunktype, count);
+}
+
+giblorb_err_t giblorb_load_chunk_by_number(giblorb_map_t *map,
+    glui32 method, giblorb_result_t *res, glui32 chunknum)
+{
+    giblorb_err_t  (*funcPtr)(giblorb_map_t *map,
+        glui32 method, giblorb_result_t *res, glui32 chunknum);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "giblorb_load_chunk_by_number", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(map, method, res, chunknum);
+}
+
+giblorb_err_t giblorb_unload_chunk(giblorb_map_t *map, glui32 chunknum)
+{
+    giblorb_err_t  (*funcPtr)(giblorb_map_t *map, glui32 chunknum);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "giblorb_unload_chunk", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(map, chunknum);
+}
+
+giblorb_err_t giblorb_load_resource(giblorb_map_t *map,
+    glui32 method, giblorb_result_t *res, glui32 usage, glui32 resnum)
+{
+    giblorb_err_t  (*funcPtr)(giblorb_map_t *map,
+        glui32 method, giblorb_result_t *res, glui32 usage, glui32 resnum);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "giblorb_load_resource", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(map, method, res, usage, resnum);
+}
+
+giblorb_err_t giblorb_count_resources(giblorb_map_t *map,
+    glui32 usage, glui32 *num, glui32 *min, glui32 *max)
+{
+    giblorb_err_t  (*funcPtr)(giblorb_map_t *map,
+        glui32 usage, glui32 *num, glui32 *min, glui32 *max);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "giblorb_count_resources", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(map, usage, num, min, max);
+}
--- glkloader-0.3.2/Makefile~	2007-12-09 11:18:08.000000000 +0000
+++ glkloader-0.3.2/Makefile	2007-12-09 11:28:40.000000000 +0000
@@ -31,7 +31,7 @@
 
 OBJS =  \
 	glkloader.o glkfuncs.o blorbfuncs.o dispafuncs.o unixfuncs.o \
-    linux_defines.o gi_blorb.o gi_dispa.o
+    linux_defines.o
 
 HEADERS = \
 	defines.h linux_defines.h
--- glkloader-0.3.2/dispafuncs.c~	2001-03-14 03:07:59.000000000 +0000
+++ glkloader-0.3.2/dispafuncs.c	2007-12-09 11:30:51.000000000 +0000
@@ -95,3 +95,129 @@
 
     return (*funcPtr)(regi, unregi);
 }
+
+void gidispatch_call(glui32 funcnum, glui32 numargs, gluniversal_t *arglist)
+{
+    void (*funcPtr)(glui32 funcnum, glui32 numargs, gluniversal_t *arglist);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_call", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(funcnum, numargs, arglist);
+}
+
+char *gidispatch_prototype(glui32 funcnum)
+{
+    char * (*funcPtr)(glui32 funcnum);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_prototype", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(funcnum);
+}
+
+glui32 gidispatch_count_classes(void)
+{
+    glui32 (*funcPtr)(void);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_count_classes", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)();
+}
+
+gidispatch_intconst_t *gidispatch_get_class(glui32 index)
+{
+    gidispatch_intconst_t * (*funcPtr)(glui32 index);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_get_class", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(index);
+}
+
+glui32 gidispatch_count_intconst(void)
+{
+    glui32 (*funcPtr)(void);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_count_intconst", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)();
+}
+
+gidispatch_intconst_t *gidispatch_get_intconst(glui32 index)
+{
+    gidispatch_intconst_t * (*funcPtr)(glui32 index);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_get_intconst", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(index);
+}
+
+glui32 gidispatch_count_functions(void)
+{
+    glui32 (*funcPtr)(void);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_count_functions", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)();
+}
+
+gidispatch_function_t *gidispatch_get_function(glui32 index)
+{
+    gidispatch_function_t * (*funcPtr)(glui32 index);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_get_function", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(index);
+}
+
+gidispatch_function_t *gidispatch_get_function_by_id(glui32 id)
+{
+    gidispatch_function_t * (*funcPtr)(glui32 id);
+    char * errBuf = NULL;
+
+    funcPtr = loadSymbol(gGlkLib, "gidispatch_get_function_by_id", &errBuf);
+    if (NULL != errBuf) {
+        fprintf(stderr, "%s\n", errBuf);
+        exit(1);
+    }
+
+    return (*funcPtr)(id);
+}