Make the custom heap thing more portable and slower

include/sdb/heap.h

@@ -12,47 +12,50 @@ typedef struct sdb_global_heap_t {
 	void *data;
 } SdbGlobalHeap;
 
-extern SdbGlobalHeap Gheap;
-extern const SdbGlobalHeap sdb_gh_custom; // custom heap allocator
-extern const SdbGlobalHeap sdb_gh_libc; // use libc's heap
+SDB_API SdbGlobalHeap *sdb_heap_global(void);
 
 static inline void sdb_gh_use(const SdbGlobalHeap *gh) {
+	SdbGlobalHeap *gheap = sdb_heap_global ();
 	if (gh) {
-		memcpy (&Gheap, gh, sizeof (SdbGlobalHeap));
+		memcpy (gheap, gh, sizeof (SdbGlobalHeap));
 	} else {
-		memset (&Gheap, 0, sizeof (SdbGlobalHeap));
+		memset (gheap, 0, sizeof (SdbGlobalHeap));
 	}
 }
 
 static inline void sdb_gh_fini(void) {
-	if (Gheap.fini) {
-		Gheap.fini (Gheap.data);
+	SdbGlobalHeap *gheap = sdb_heap_global ();
+	if (gheap->fini) {
+		gheap->fini (gheap->data);
 	}
 }
 
 static inline void *sdb_gh_malloc(size_t size) {
-	if (Gheap.realloc) {
-		void *ptr = Gheap.realloc (Gheap.data, NULL, size);
+	SdbGlobalHeap *gheap = sdb_heap_global ();
+	if (gheap->realloc) {
+		void *ptr = gheap->realloc (gheap->data, NULL, size);
 //		eprintf ("malloc %p\n" , ptr);
 		return ptr;
 	}
 	return malloc (size);
 }
 
 static inline void *sdb_gh_realloc(void *ptr, size_t size) {
-	if (Gheap.realloc) {
-		return Gheap.realloc (Gheap.data, ptr, size);
+	SdbGlobalHeap *gheap = sdb_heap_global ();
+	if (gheap->realloc) {
+		return gheap->realloc (gheap->data, ptr, size);
 	}
 	return realloc (ptr, size);
 }
 
 static inline void sdb_gh_free(void *ptr) {
+	SdbGlobalHeap *gheap = sdb_heap_global ();
 	if (!ptr) {
 		return;
 	}
-	if (Gheap.realloc) {
+	if (gheap->realloc) {
 // 		eprintf ("free ptr %p\n" , ptr);
-		Gheap.realloc (Gheap.data, ptr, 0);
+		gheap->realloc (gheap->data, ptr, 0);
 	} else {
 		free (ptr);
 	}

src/entry.c

@@ -4,6 +4,8 @@
 #define SDB_CUSTOM_HEAP sdb_gh_custom
 #endif
 
+static const SdbGlobalHeap sdb_gh_libc = { NULL, NULL, NULL };
+
 int main(int argc, const char **argv) {
 #if USE_SDB_HEAP
 	sdb_gh_use (&SDB_CUSTOM_HEAP);

src/heap.c

@@ -7,8 +7,11 @@
 #include "sdb/sdb.h"
 #include "sdb/heap.h"
 
-const SdbGlobalHeap sdb_gh_libc = { NULL, NULL, NULL };
-SdbGlobalHeap Gheap = {NULL, NULL};
+static SdbGlobalHeap Gheap = { NULL, NULL, NULL };
+
+SDB_API SdbGlobalHeap *sdb_heap_global(void) {
+	return &Gheap;
+}
 
 SDB_API char *sdb_strdup(const char *s) {
 	size_t sl = strlen (s) + 1;