proper check for the -std=gnu++11 standard, and take in on clang too

[simgrid.git] / src / mc / mc_mmalloc.h

diff --git a/src/mc/mc_mmalloc.h b/src/mc/mc_mmalloc.h
index b59d7d7..c1f5ffe 100644 (file)
--- a/src/mc/mc_mmalloc.h
+++ b/src/mc/mc_mmalloc.h
@@ -4,8 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef MC_MMALLOC_H
-#define MC_MMALLOC_H
+#ifndef SIMGRID_MC_MMALLOC_H
+#define SIMGRID_MC_MMALLOC_H
 
 #include <xbt/misc.h>
 #include <xbt/mmalloc.h>
@@ -20,9 +20,6 @@
 
 SG_BEGIN_DECL()
 
-extern xbt_mheap_t std_heap;
-extern xbt_mheap_t mc_heap;
-
 /* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
 /* an API to query about the status of a heap, we simply call mmstats and */
 /* because I now how does structure looks like, then I redefine it here */
@@ -35,9 +32,6 @@ extern xbt_mheap_t mc_heap;
 /*   size_t bytes_free;            /\* Byte total of chunks in the free list. *\/ */
 /* }; */
 
-#define MC_SET_MC_HEAP    mmalloc_set_current_heap(mc_heap)
-#define MC_SET_STD_HEAP  mmalloc_set_current_heap(std_heap)
-
 SG_END_DECL()
 
 #endif