Merge pull request #2145 from andreasBihlmaier:2.4

11 years ago · 2fde4d8a94
parent 2443e8090e 49dfa5a17f
commit 2fde4d8a94
6 changed files with 6 additions and 6 deletions
--- a/3rdparty/include/opencl/1.2/CL/cl.hpp
+++ b/3rdparty/include/opencl/1.2/CL/cl.hpp
@ -210,7 +210,7 @@
 #include <string>
 #endif 

-#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
+#if defined(__linux__) || defined(__APPLE__) || defined(__MACOSX)
 #include <alloca.h>

 #include <emmintrin.h>
--- a/modules/ocl/src/cl_runtime/cl_runtime.cpp
+++ b/modules/ocl/src/cl_runtime/cl_runtime.cpp
@ -45,7 +45,7 @@
    #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
 #endif // _WIN32

-#if defined(linux)
+#if defined(__linux__)
    #include <dlfcn.h>
    #include <stdio.h>

--- a/modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
+++ b/modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
@ -27,7 +27,7 @@
    #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
 #endif // _WIN32

-#if defined(linux)
+#if defined(__linux__)
    #include <dlfcn.h>
    #include <stdio.h>

--- a/modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
+++ b/modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
@ -27,7 +27,7 @@
    #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
 #endif // _WIN32

-#if defined(linux)
+#if defined(__linux__)
    #include <dlfcn.h>
    #include <stdio.h>

--- a/modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
+++ b/modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
@ -24,7 +24,7 @@
    #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
 #endif // _WIN32

-#if defined(linux)
+#if defined(__linux__)
    #include <dlfcn.h>
    #include <stdio.h>

--- a/modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
+++ b/modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
@ -24,7 +24,7 @@
    #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
 #endif // _WIN32

-#if defined(linux)
+#if defined(__linux__)
    #include <dlfcn.h>
    #include <stdio.h>