From: cristianrosa <cristianrosa@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 18 May 2010 09:34:16 +0000 (+0000)
Subject: Fix problem on merge from svn
X-Git-Tag: v3_5~1039
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5d34793ea0d4548ea73e2a7182428472c40ba0b4

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 2150703a3d..e92aec96d9 100644
--- 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"
 
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>