X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fc11b8e2c3f486babc8be5494ddd53ffcc659f4..bace8e5a6ff160e200f799250796c5303dc487ba:/include/smpi/mpi.h diff --git a/include/smpi/mpi.h b/include/smpi/mpi.h index e8aa3eae90..2cb6aca2b4 100644 --- a/include/smpi/mpi.h +++ b/include/smpi/mpi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012. The SimGrid Team. +/* Copyright (c) 2010-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,7 +10,6 @@ #define SEED 221238 #define sleep(x) smpi_sleep(x) -#define gettimeofday(x, y) smpi_gettimeofday(x) #include #include @@ -18,7 +17,10 @@ #include #include -#ifdef HAVE_MC +#include /* Load it before the define next line to not mess with the system headers */ +#define gettimeofday(x, y) smpi_gettimeofday(x, NULL) + +#if HAVE_MC #undef assert #define assert(x) MC_assert(x) #endif