|
@@ -1,6 +1,6 @@
|
|
/* StarPU --- Runtime system for heterogeneous multicore architectures.
|
|
/* StarPU --- Runtime system for heterogeneous multicore architectures.
|
|
*
|
|
*
|
|
- * Copyright (C) 2010-2014 Université de Bordeaux
|
|
|
|
|
|
+ * Copyright (C) 2010-2015 Université de Bordeaux
|
|
* Copyright (C) 2010, 2011, 2012, 2013, 2014 Centre National de la Recherche Scientifique
|
|
* Copyright (C) 2010, 2011, 2012, 2013, 2014 Centre National de la Recherche Scientifique
|
|
*
|
|
*
|
|
* StarPU is free software; you can redistribute it and/or modify
|
|
* StarPU is free software; you can redistribute it and/or modify
|
|
@@ -303,14 +303,14 @@ double starpu_timing_now(void);
|
|
|
|
|
|
#ifdef _WIN32
|
|
#ifdef _WIN32
|
|
/* Try to fetch the system definition of timespec */
|
|
/* Try to fetch the system definition of timespec */
|
|
|
|
+#include <sys/types.h>
|
|
|
|
+#include <sys/stat.h>
|
|
|
|
+#include <unistd.h>
|
|
#include <time.h>
|
|
#include <time.h>
|
|
-#if defined(__MINGW32__) || defined(__CYGWIN__)
|
|
|
|
-#include <sys/time.h>
|
|
|
|
-#endif
|
|
|
|
#if !defined(_MSC_VER) || defined(BUILDING_STARPU)
|
|
#if !defined(_MSC_VER) || defined(BUILDING_STARPU)
|
|
#include <pthread.h>
|
|
#include <pthread.h>
|
|
#endif
|
|
#endif
|
|
-#if !defined(_TIMESPEC_DEFINED) && !defined(HAVE_STRUCT_TIMESPEC)
|
|
|
|
|
|
+#ifndef STARPU_HAVE_STRUCT_TIMESPEC
|
|
/* If it didn't get defined in the standard places, then define it ourself */
|
|
/* If it didn't get defined in the standard places, then define it ourself */
|
|
#ifndef STARPU_TIMESPEC_DEFINED
|
|
#ifndef STARPU_TIMESPEC_DEFINED
|
|
#define STARPU_TIMESPEC_DEFINED 1
|
|
#define STARPU_TIMESPEC_DEFINED 1
|
|
@@ -319,7 +319,7 @@ struct timespec {
|
|
long tv_nsec; /* Nanoseconds */
|
|
long tv_nsec; /* Nanoseconds */
|
|
};
|
|
};
|
|
#endif /* STARPU_TIMESPEC_DEFINED */
|
|
#endif /* STARPU_TIMESPEC_DEFINED */
|
|
-#endif
|
|
|
|
|
|
+#endif /* STARPU_HAVE_STRUCT_TIMESPEC */
|
|
#else
|
|
#else
|
|
#include <sys/time.h>
|
|
#include <sys/time.h>
|
|
#endif /* _WIN32 */
|
|
#endif /* _WIN32 */
|