浏览代码

include: fixes for windows

Nathalie Furmento 9 年之前
父节点
当前提交
5754f2056d
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 4 1
      include/pthread_win32/pthread.h
  2. 2 1
      include/starpu_config.h.in

+ 4 - 1
include/pthread_win32/pthread.h

@@ -34,7 +34,10 @@ extern "C" {
 #include <windows.h>
 #include <windows.h>
 #include <sys/types.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
+#ifndef STARPU_CONFIGURE
+#  include <starpu_config.h>
+#endif
+#ifdef STARPU_HAVE_UNISTD_H
 #include <unistd.h>
 #include <unistd.h>
 #endif
 #endif
 #include <time.h>
 #include <time.h>

+ 2 - 1
include/starpu_config.h.in

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  *
  * Copyright (C) 2009-2015  Université de Bordeaux
  * Copyright (C) 2009-2015  Université de Bordeaux
- * Copyright (C) 2010, 2011, 2012, 2013  CNRS
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015  CNRS
  * Copyright (C) 2014  INRIA
  * Copyright (C) 2014  INRIA
  *
  *
  * StarPU is free software; you can redistribute it and/or modify
  * StarPU is free software; you can redistribute it and/or modify
@@ -101,6 +101,7 @@
 #undef STARPU_HAVE_WINDOWS
 #undef STARPU_HAVE_WINDOWS
 #undef STARPU_LINUX_SYS
 #undef STARPU_LINUX_SYS
 #undef STARPU_HAVE_UNSETENV
 #undef STARPU_HAVE_UNSETENV
+#undef STARPU_HAVE_UNISTD_H
 
 
 #ifdef _MSC_VER
 #ifdef _MSC_VER
 typedef long starpu_ssize_t;
 typedef long starpu_ssize_t;