Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / xbt / mmalloc.h

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index 419a836..a8b49c4 100644 (file)
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -7,22 +7,17 @@
 /* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
    This file was then part of the GNU C Library. */
 
-#ifndef MMALLOC_H
-#define MMALLOC_H 1
+#ifndef SIMGRID_MMALLOC_H
+#define SIMGRID_MMALLOC_H 1
 
-#include <simgrid_config.h>
-#ifdef HAVE_MMALLOC
+#include "src/internal_config.h"
+#if HAVE_MMALLOC
 
-#ifdef HAVE_STDDEF_H
-#  include <stddef.h>
-#else
-#  include <sys/types.h>        /* for size_t */
-#  include <stdio.h>            /* for NULL */
-#endif
+# include <sys/types.h>        /* for size_t */
+# include <stdio.h>            /* for NULL */
 
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
-#include "src/mc/mc_forward.h"
 
 SG_BEGIN_DECL()
 
@@ -64,13 +59,6 @@ XBT_PUBLIC( xbt_mheap_t ) mmalloc_get_default_md(void);
 xbt_mheap_t mmalloc_set_current_heap(xbt_mheap_t new_heap);
 xbt_mheap_t mmalloc_get_current_heap(void);
 
-int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2);
-int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2);
-int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t to_ignore1, xbt_dynar_t to_ignore2);
-int compare_heap_area(int process_index, const void *area1, const void* area2, mc_snapshot_t snapshot1,
-                      mc_snapshot_t snapshot2, xbt_dynar_t previous, mc_type_t type, int pointer_level);
-void reset_heap_information(void);
-
 size_t mmalloc_get_bytes_used(xbt_mheap_t);
 ssize_t mmalloc_get_busy_size(xbt_mheap_t, void *ptr);
 
@@ -79,4 +67,4 @@ void* malloc_no_memset(size_t n);
 SG_END_DECL()
 
 #endif
-#endif                          /* MMALLOC_H */
+#endif                          /* SIMGRID_MMALLOC_H */