Fix problem on merge from svn

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7769 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 2150703..e92aec9 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -16,7 +16,6 @@
 #include "portable.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt/mmalloc.h"
 #include "portable.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt/mmalloc.h"

-#include "portable.h"

 
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
 
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>