Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --combined src/kernel/activity/ConditionVariableImpl.cpp
index 80aaae6,3e43ab3..e284d60
--- 1/src/kernel/activity/ConditionVariableImpl.cpp
--- 2/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@@ -108,14 -108,14 +108,14 @@@ void ConditionVariableImpl::signal(
  
      /* Now transform the cond wait simcall into a mutex lock one */
      smx_simcall_t simcall = &proc.simcall;
-     smx_mutex_t mutex;
+     smx_mutex_t simcall_mutex;
      if (simcall->call == SIMCALL_COND_WAIT)
-       mutex = simcall_cond_wait__get__mutex(simcall);
+       simcall_mutex = simcall_cond_wait__get__mutex(simcall);
      else
-       mutex = simcall_cond_wait_timeout__get__mutex(simcall);
+       simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
      simcall->call = SIMCALL_MUTEX_LOCK;
  
-     simcall_HANDLER_mutex_lock(simcall, mutex);
+     simcall_HANDLER_mutex_lock(simcall, simcall_mutex);
    }
    XBT_OUT();
  }
@@@ -152,3 -152,13 +152,3 @@@ void intrusive_ptr_release(simgrid::ker
  } // namespace activity
  } // namespace kernel
  }
 -
 -XBT_PRIVATE void simcall_HANDLER_cond_signal(smx_simcall_t /*simcall*/, smx_cond_t cond)
 -{
 -  cond->signal();
 -}
 -
 -XBT_PRIVATE void simcall_HANDLER_cond_broadcast(smx_simcall_t /*simcall*/, smx_cond_t cond)
 -{
 -  cond->broadcast();
 -}