merge conflicts resolved

diff --cc src/mc/mc_liveness.c
index 81c402d,3c093ad..8ff2144
--- 1/src/mc/mc_liveness.c
--- 2/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@@ -77,84 -60,46 +77,84 @@@ int snapshot_compare(mc_snapshot_t s1, 
        break;
      case 1 :
        if(s1->regions[i]->size != s2->regions[i]->size){
 -      //XBT_DEBUG("Different size of libsimgrid (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
        if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
 -      //XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
        if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
 -      //XBT_DEBUG("Different memcmp for data in libsimgrid");
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different memcmp for data in libsimgrid");
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
        break;
 -    case 2:
 +      /*case 2:
        if(s1->regions[i]->size != s2->regions[i]->size){
 -      //XBT_DEBUG("Different size of program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
 -      return 1;
 -      }
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
 +        errors++;
 +      }else{
 +        return 1;
 +      }
-       }      
++      } 
        if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
 -      //XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
        if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
 -      //XBT_DEBUG("Different memcmp for data in program");
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different memcmp for data in program");
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
 -      break;
 +      break;*/
      case 3:
        if(s1->regions[i]->size != s2->regions[i]->size){
 -      //XBT_DEBUG("Different size of stack (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size);
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
        if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
 -      //XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
        if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
 -      //XBT_DEBUG("Different memcmp for data in stack");
 -      return 1;
 +      if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
 +        XBT_DEBUG("Different memcmp for data in stack");
 +        errors++;
 +      }else{
 +        return 1;
 +      }
        }
        break;
 +    default:
 +      break;
      }
    }
  

diff --cc src/xbt/mmalloc/mm_legacy.c
Simple merge