clean up the ifdefs

diff --git a/source/mem/mem.c b/source/mem/mem.c
index 1debf3a0c267beb808c3a67070333e071859dd6f..a3e23abeee3b71f2271576ecc38389677834c0cd 100644 (file)
--- a/source/mem/mem.c
+++ b/source/mem/mem.c
@@ -1,6 +1,6 @@
 #include "mem.h"
 #include <stdlib.h>
-#if (defined(LEAK_DETECTION) && !defined(NDEBUG))
+#ifdef LEAK_DETECTION
 #include <stdbool.h>
 #include <stdio.h>
 #endif
@@ -14,11 +14,10 @@ typedef struct {
     intptr_t val;
 } box_t;
 
-
 /* If LEAK_DETECTION is turned on then we need to disable the mem_allocate macro
  * for the duration of this file. This allows us to use the original
  * mem_allocate function without modification in mem_allocate_ld */
-#if (defined(LEAK_DETECTION) && !defined(NDEBUG))
+#ifdef LEAK_DETECTION
 #undef mem_allocate
 #endif
 
@@ -30,7 +29,7 @@ void* mem_allocate(size_t size, destructor_t p_destruct_fn)
     return (void*)(p_obj+1);
 }
 
-#if (defined(LEAK_DETECTION) && !defined(NDEBUG))
+#ifdef LEAK_DETECTION
 typedef struct block_t {
     void* p_obj;
     const char* p_file;
@@ -49,8 +48,8 @@ static void print_live_objects(void) {
     while (NULL != p_curr)
     {
         block_t* to_be_freed = p_curr;
-        printf("%#x %s (line %d): %d references to object\n",
-               (unsigned int)p_curr->p_obj,
+        printf("%p %s (line %d): %d references to object\n",
+               p_curr->p_obj,
                p_curr->p_file,
                p_curr->line,
                mem_num_references(p_curr->p_obj));
@@ -90,7 +89,7 @@ void mem_retain(void* p_obj)
     p_hdr->refcount += 1;
 }
 
-#if (defined(LEAK_DETECTION) && !defined(NDEBUG))
+#ifdef LEAK_DETECTION
 static void deregister_block(void* p_obj)
 {
     block_t* p_prev = NULL;
@@ -126,7 +125,7 @@ void mem_release(void* p_obj)
     p_hdr->refcount -= 1;
     if(p_hdr->refcount < 1)
     {
-        #if (defined(LEAK_DETECTION) && !defined(NDEBUG))
+        #ifdef LEAK_DETECTION
         deregister_block(p_obj);
         #endif
         if(p_hdr->p_finalize)

diff --git a/source/mem/mem.h b/source/mem/mem.h
index 7635a9048e94b6c1de5d77e5e8b6376c1b3403b5..16ab53eeea214bfa9fc4acf4c922ddf25da7d729 100644 (file)
--- a/source/mem/mem.h
+++ b/source/mem/mem.h
@@ -17,6 +17,11 @@ extern "C" {
 /** A function pointer for object destructors */
 typedef void (*destructor_t)(void* p_val);
 
+/* If debug is disabled, disable leak detection as well */
+#ifdef NDEBUG
+#undef LEAK_DETECTION
+#endif
+
 #ifndef LEAK_DETECTION
 /**
  * @brief Allocates a new reference counted object of the given size which will