-/*
-#define sleep(x) smpi_sleep(x)
-#define gettimeofday(x, y) smpi_gettimeofday(x, y)
-#define main(x, y) smpi_simulated_main(x, y)
-*/
+#define gettimeofday(x, y) smpi_gettimeofday(x, NULL)
+
+#ifdef HAVE_MC
+#undef assert
+#define assert(x) MC_assert(x)
+#endif