Merge branch 'matthiaskrgr/stuff' into 'master'

[xonotic/d0_blind_id.git] / d0.c

diff --git a/d0.c b/d0.c
index 64d0684a7b6f353cdb41917e2ec8273090d9ecf4..c8920b4ef5a120ad66f94b9d3355f152239063f1 100644 (file)
--- a/d0.c
+++ b/d0.c
@@ -1,9 +1,11 @@
+#include "d0.h"
+
 /*
  * include the license notice into the dynamic library to "reproduce the
  * copyright notice" automatically, so the application developer does not have
  * to care about this term
  */
-const char *d0_bsd_license_notice = "\n"
+const char *d0_bsd_license_notice D0_USED = "\n"
 "/*\n"
 " * FILE:      d0.c\n"
 " * AUTHOR:    Rudolf Polzer - divVerent@xonotic.org\n"
@@ -39,8 +41,6 @@ const char *d0_bsd_license_notice = "\n"
 " * $Id$\n"
 " */\n";
 
-#include "d0.h"
-
 #include <stdlib.h>
 
 //#define MUTEX_DEBUG
@@ -97,12 +97,12 @@ static int dummy_unlockmutex(void *m)
 }
 #endif
 
-d0_malloc_t *d0_malloc = malloc;
-d0_free_t *d0_free = free;
-d0_createmutex_t *d0_createmutex = dummy_createmutex;
-d0_destroymutex_t *d0_destroymutex = dummy_destroymutex;
-d0_lockmutex_t *d0_lockmutex = dummy_lockmutex;
-d0_unlockmutex_t *d0_unlockmutex = dummy_unlockmutex;
+d0_malloc_t *d0_malloc = NULL;
+d0_free_t *d0_free = NULL;
+d0_createmutex_t *d0_createmutex = NULL;
+d0_destroymutex_t *d0_destroymutex = NULL;
+d0_lockmutex_t *d0_lockmutex = NULL;
+d0_unlockmutex_t *d0_unlockmutex = NULL;
 
 void d0_setmallocfuncs(d0_malloc_t *m, d0_free_t *f)
 {
@@ -117,3 +117,9 @@ void d0_setmutexfuncs(d0_createmutex_t *c, d0_destroymutex_t *d, d0_lockmutex_t
        d0_lockmutex = (l ? l : dummy_lockmutex);
        d0_unlockmutex = (u ? u : dummy_unlockmutex);
 }
+
+void d0_initfuncs(void)
+{
+       d0_setmallocfuncs(d0_malloc, d0_free);
+       d0_setmutexfuncs(d0_createmutex, d0_destroymutex, d0_lockmutex, d0_unlockmutex);
+}