generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2145 from andreasBihlmaier:2.4

Browse Source
This commit is contained in:
Roman Donchenko
2014-01-14 11:55:28 +04:00
committed by OpenCV Buildbot
parent 2443e8090e 49dfa5a17f
commit 2fde4d8a94
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/include/opencl/1.2/CL/cl.hpp vendored
View File

@@ -210,7 +210,7 @@
#include <string> #include <string>
#endif #endif
#if defined(linux) || defined(__APPLE__) || defined(__MACOSX) #if defined(__linux__) || defined(__APPLE__) || defined(__MACOSX)
#include <alloca.h> #include <alloca.h>
#include <emmintrin.h> #include <emmintrin.h>

2
modules/ocl/src/cl_runtime/cl_runtime.cpp
View File

@@ -45,7 +45,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name) #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32 #endif // _WIN32
#if defined(linux) #if defined(__linux__)
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h> #include <stdio.h>

2
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
View File

@@ -27,7 +27,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name) #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32 #endif // _WIN32
#if defined(linux) #if defined(__linux__)
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h> #include <stdio.h>

2
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
View File

@@ -27,7 +27,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name) #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32 #endif // _WIN32
#if defined(linux) #if defined(__linux__)
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h> #include <stdio.h>

2
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
View File

@@ -24,7 +24,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name) #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32 #endif // _WIN32
#if defined(linux) #if defined(__linux__)
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h> #include <stdio.h>

2
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
View File

@@ -24,7 +24,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name) #define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32 #endif // _WIN32
#if defined(linux) #if defined(__linux__)
#include <dlfcn.h> #include <dlfcn.h>
#include <stdio.h> #include <stdio.h>