I forgot to update my tree before commiting (once again), and got conflicts as punishment

[simgrid.git] / src / xbt / xbt_sg_synchro.c

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index db92f6556a9e51fa1b2f05d12a7cdfbc1a3c5641..d485ba37ed89af79266f3d4dc967f477fa35a60d 100644 (file)
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -13,8 +13,7 @@
 
 #include "xbt/synchro.h"        /* This module */
 
 
 #include "xbt/synchro.h"        /* This module */
 

-#include "simix/simix.h"        /* used implementation */
-#include "simix/datatypes.h"
+#include "simgrid/simix.h"        /* used implementation */

 #include "../simix/smx_private.h" /* FIXME */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
 #include "../simix/smx_private.h" /* FIXME */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,