Moved NUM_HEAPS and MIN_FRAG_THRESHOLD to dmm_config.h. NUM_HEAPS has a variable now in CMake, for P2012 it is set to 0.

DefineOptions.cmake

@@ -2,6 +2,7 @@ option(HAVE_LOCKS "Build with POSIX locking mechanisms" ON)
 option(WITH_EXAMPLES "Build with examples" OFF)
 option(WITH_MEMORY_SPACE_AWARENESS "Build with memory space awareness" OFF)
 option(WITH_STATIC_LIB "Build with a static library" OFF)
+set(NUM_HEAPS '0')
 
 option(P2012 "Build for P2012 runtime" OFF)
 
@@ -9,5 +10,6 @@ if (P2012)
   set(HAVE_LOCKS OFF)
   set(WITH_MEMORY_SPACE_AWARENESS ON)
   set(WITH_STATIC_LIB ON)
+  set(NUM_HEAPS '0')
 endif (P2012)
 

dmm_config.h.in

@@ -4,5 +4,12 @@
 #cmakedefine HAVE_LOCKS
 #cmakedefine WITH_MEMORY_SPACE_AWARENESS
 
+/**
+ * \brief The number of the heaps.
+ */
+#cmakedefine NUM_HEAPS @NUM_HEAPS@
+
+#define MIN_FRAG_THRESHOLD 0.05
+
 #endif /* DMM_CONFIG_H */
 

include/dmmlib/heap.h

@@ -17,12 +17,7 @@
 #include <pthread.h>
 #endif /* HAVE_LOCKS */
 
-/**
- * \brief The number of the heaps.
- */
-#define NUM_HEAPS 4
 
-#define MIN_FRAG_THRESHOLD 0.05
 
 typedef uint8_t knob_state_t;