MonetDB: embedded - Getting embedded to compile again

[Hannes Muehleisen]

Changeset: 40588d1f2b95 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40588d1f2b95
Modified Files:
        gdk/gdk_bbp.h
        tools/embedded/embedded.c
Branch: embedded
Log Message:

Getting embedded to compile again


diffs (49 lines):

diff --git a/gdk/gdk_bbp.h b/gdk/gdk_bbp.h
--- a/gdk/gdk_bbp.h
+++ b/gdk/gdk_bbp.h
@@ -60,7 +60,7 @@ gdk_export bat getBBPsize(void); /* curr
 
 /* global calls */
 gdk_export void BBPaddfarm(const char *dirname, int rolemask);
-gdk_export void BBPresetfarms();
+gdk_export void BBPresetfarms(void);
 
 /* update interface */
 gdk_export void BBPclear(bat bid);
diff --git a/tools/embedded/embedded.c b/tools/embedded/embedded.c
--- a/tools/embedded/embedded.c
+++ b/tools/embedded/embedded.c
@@ -93,7 +93,7 @@ char* monetdb_startup(char* libdir, char
                goto cleanup;
        }
        MT_lock_init(&monetdb_embedded_lock, "monetdb_embedded_lock");
-       MT_lock_set(&monetdb_embedded_lock, "monetdb.startup");
+       MT_lock_set(&monetdb_embedded_lock);
        if (monetdb_embedded_initialized) goto cleanup;
 
        setlen = mo_builtin_settings(&set);
@@ -161,7 +161,7 @@ char* monetdb_startup(char* libdir, char
        monetdb_disconnect(c);
 cleanup:
        mo_free_options(set, setlen);
-       MT_lock_unset(&monetdb_embedded_lock, "monetdb.startup");
+       MT_lock_unset(&monetdb_embedded_lock);
        return retval;
 }
 
@@ -293,7 +293,7 @@ str monetdb_get_columns(void* conn, cons
 }
 
 void monetdb_shutdown() {
-       MT_lock_set(&monetdb_embedded_lock, "monetdb.shutdown");
+       MT_lock_set(&monetdb_embedded_lock);
        // kill SQL
        (*SQLepilogue_ptr)(NULL);
        // kill MAL & GDK
@@ -301,5 +301,5 @@ void monetdb_shutdown() {
        // clean up global state
        BBPresetfarms();
        monetdb_embedded_initialized = 0;
-       MT_lock_unset(&monetdb_embedded_lock, "monetdb.shutdown");
+       MT_lock_unset(&monetdb_embedded_lock);
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list