Merge branch 'mc' into mc++

[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 e9bbaeb..4907e6f 100644 (file)
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -3,15 +3,14 @@
 
 /* This is the simulation implementation, using simix.                      */
 
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/ex.h"
-
-#include "xbt/synchro.h"        /* This module */
+#include "xbt/synchro_core.h"
 
 #include "simgrid/simix.h"        /* used implementation */
 #include "../simix/smx_private.h" /* FIXME */
@@ -66,7 +65,7 @@ xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
   simcall_process_create(&res->s_process, name,
                            xbt_thread_create_wrapper, res,
                            SIMIX_host_self_get_name(), -1.0, 0, NULL,
-                           /*props */ NULL);
+                           /*props */ NULL,0);
   res->joinable = joinable;
   res->done = 0;
   res->cond = xbt_cond_init();