Merge pull request #982 from rmcgibbo/commit

Compiling on Windows

Merge pull request #982 from rmcgibbo/commit
Compiling on Windows
0fba96e7 · peastman · 0b4a1077 · dc8c70d2 · 0fba96e7 · 0fba96e7
Commit 0fba96e7 authored Jun 22, 2015 by peastman
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

cmake_modules/FindOpenCL.cmake cmake_modules/FindOpenCL.cmake +1 -0

libraries/pthreads/include/pthread.h libraries/pthreads/include/pthread.h +4 -1

No files found.
--- a/cmake_modules/FindOpenCL.cmake
+++ b/cmake_modules/FindOpenCL.cmake
@@ -79,6 +79,7 @@ find_library(OPENCL_LIBRARY
        "/usr/local/cuda"
        "/usr/local/streamsdk"
        "/usr"
+        "${CUDA_TOOLKIT_ROOT_DIR}"
    PATH_SUFFIXES ${path_suffixes} "lib"
 )


--- a/libraries/pthreads/include/pthread.h
+++ b/libraries/pthreads/include/pthread.h
@@ -54,9 +54,12 @@
 #include <sys/timeb.h>
 #include <process.h>

+#ifndef ETIMEDOUT
 #define ETIMEDOUT	110
+#endif
+#ifndef ENOTSUP
 #define ENOTSUP		134
-
+#endif

 #define PTHREAD_CANCEL_DISABLE 0
 #define PTHREAD_CANCEL_ENABLE 0x01