update

diff --cc buildtools/Cmake/CompleteInFiles.cmake
index 9cabdc4,078c27e..9630986
--- 1/buildtools/Cmake/CompleteInFiles.cmake
--- 2/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@@ -152,15 -152,15 +152,19 @@@ execute_process
  
  if(HAVE_thread_storage_run)
    set(HAVE_THREAD_LOCAL_STORAGE 0)
 -else(HAVE_thread_storage_run)
 +else()
    set(HAVE_THREAD_LOCAL_STORAGE 1)
 -endif(HAVE_thread_storage_run)
 +endif()
  
  # Our usage of mmap is Linux-specific (flag MAP_ANONYMOUS), but kFreeBSD uses a GNU libc
- IF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU")
+ IF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU" AND NOT  "${CMAKE_SYSTEM}" MATCHES "Darwin")
    SET(HAVE_MMAP 0)
    message(STATUS "Warning: MMAP is thought as non functional on this architecture (${CMAKE_SYSTEM})")
++<<<<<<< HEAD
 +ENDIF()
++=======
+ ENDIF(NOT "${CMAKE_SYSTEM}" MATCHES "Linux" AND NOT "${CMAKE_SYSTEM}" MATCHES "kFreeBSD" AND NOT "${CMAKE_SYSTEM}" MATCHES "GNU" AND NOT  "${CMAKE_SYSTEM}" MATCHES "Darwin")
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
  
  if(WIN32) #THOSE FILES ARE FUNCTIONS ARE NOT DETECTED BUT THEY SHOULD...
    set(HAVE_UCONTEXT_H 1)

diff --cc src/surf/simgrid_dtd.c
index 606179d,9e8ceff..f28667b
--- 1/src/surf/simgrid_dtd.c
--- 2/src/surf/simgrid_dtd.c
+++ b/src/surf/simgrid_dtd.c
@@@ -6975,27 -7151,27 +7150,47 @@@ YY_RULE_SETU
  case 246:
  /* rule 246 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_id);
++=======
+ if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cluster>");} surfxml_cluster_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_id);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 247:
  /* rule 247 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_id);
++=======
+ if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cluster>");}  surfxml_cluster_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_id);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 248:
  /* rule 248 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_prefix);
++=======
+ if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cluster>");} surfxml_cluster_prefix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_prefix);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 249:
  /* rule 249 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_prefix);
++=======
+ if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cluster>");}  surfxml_cluster_prefix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_prefix);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 250:
  /* rule 250 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_suffix);
++=======
+ if (surfxml_cluster_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cluster>");} surfxml_cluster_suffix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_suffix);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 251:
  /* rule 251 can match eol */
@@@ -7030,22 -7206,22 +7225,38 @@@ ENTER(VALUE1); BUFFERSET(AX_surfxml_clu
  case 257:
  /* rule 257 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_core);
++=======
+ if (surfxml_cluster_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_cluster>");}  surfxml_cluster_core_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_core);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 258:
  /* rule 258 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bw);
++=======
+ if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cluster>");} surfxml_cluster_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bw);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 259:
  /* rule 259 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bw);
++=======
+ if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cluster>");}  surfxml_cluster_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bw);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 260:
  /* rule 260 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_lat);
++=======
+ if (surfxml_cluster_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cluster>");} surfxml_cluster_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_lat);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 261:
  /* rule 261 can match eol */
@@@ -7076,17 -7252,17 +7287,29 @@@ A_surfxml_cluster_sharing_policy = A_su
  case 268:
  /* rule 268 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_bw);
++=======
+ if (surfxml_cluster_bb_bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in <surfxml_cluster>");} surfxml_cluster_bb_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_bw);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 269:
  /* rule 269 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb_bw);
++=======
+ if (surfxml_cluster_bb_bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in <surfxml_cluster>");}  surfxml_cluster_bb_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb_bw);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 270:
  /* rule 270 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_lat);
++=======
+ if (surfxml_cluster_bb_lat_isset != 0) {FAIL("Multiple definition of attribute bb_lat in <surfxml_cluster>");} surfxml_cluster_bb_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb_lat);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 271:
  /* rule 271 can match eol */
@@@ -7800,7 -8004,7 +8051,11 @@@ if (surfxml_link_latency_file_isset != 
  case 376:
  /* rule 376 can match eol */
  YY_RULE_SETUP
++<<<<<<< HEAD
 +ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency_file);
++=======
+ if (surfxml_link_latency_file_isset != 0) {FAIL("Multiple definition of attribute latency_file in <surfxml_link>");}  surfxml_link_latency_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency_file);
++>>>>>>> 52c07f4b6c9ba2b0af928b8e83c48f819e1c9fc0
        YY_BREAK
  case 377:
  /* rule 377 can match eol */