X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d13b1659a0c2551ee41b287a269e391bb2d7bc8a..41c54c2772412935a5c8fc9f2d09e623c0383ae7:/src/xbt/mmalloc/mmprivate.h diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index 07ef47d242..63e45bcab0 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -1,6 +1,6 @@ /* Declarations for `mmalloc' and friends. */ -/* Copyright (c) 2010-2014. The SimGrid Team. +/* Copyright (c) 2010-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -14,9 +14,10 @@ #ifndef __MMPRIVATE_H #define __MMPRIVATE_H 1 +#include #include -#include "portable.h" +#include "src/portable.h" #include "xbt/xbt_os_thread.h" #include "xbt/mmalloc.h" #include "xbt/ex.h" @@ -290,7 +291,7 @@ struct mdesc { /* A default malloc descriptor for the single sbrk() managed region. */ -XBT_PUBLIC( struct mdesc ) *__mmalloc_default_mdp; +XBT_PUBLIC_DATA( struct mdesc ) *__mmalloc_default_mdp; /* Remap a mmalloc region that was previously mapped. */ @@ -323,14 +324,14 @@ static inline int mmalloc_get_increment(malloc_info* heapinfo) { } } -void mmcheck(xbt_mheap_t heap); +XBT_PRIVATE void mmcheck(xbt_mheap_t heap); -int malloc_use_mmalloc(void); +XBT_PRIVATE int malloc_use_mmalloc(void); -int mmalloc_exec_using_mm(int argc, const char** argv); -void mmalloc_ensure_using_mm(int argc, const char** argv); +XBT_PRIVATE int mmalloc_exec_using_mm(int argc, const char** argv); +XBT_PRIVATE void mmalloc_ensure_using_mm(int argc, const char** argv); -size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); +XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); SG_END_DECL()