if (simgrid::simix::factory_initializer)
simix_global->context_factory = simgrid::simix::factory_initializer();
else { /* use the factory specified by --cfg=contexts/factory:value */
-#if defined(CONTEXT_THREADS) && 0
+#if defined(CONTEXT_THREADS)
if (!strcmp(smx_context_factory_name, "thread"))
simix_global->context_factory = simgrid::simix::thread_factory();
#else
#ifdef HAVE_MC
/* Cannot use posix_memalign when HAVE_MC. Align stack by hand, and save the
* pointer returned by xbt_malloc0. */
- char *alloc = xbt_malloc0(size + xbt_pagesize);
+ char *alloc = (char*)xbt_malloc0(size + xbt_pagesize);
stack = alloc - ((uintptr_t)alloc & (xbt_pagesize - 1)) + xbt_pagesize;
*((void **)stack - 1) = alloc;
#elif !defined(_XBT_WIN32)