Skip to content

O
opencv
Commit 2fde4d8a authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #2145 from andreasBihlmaier:2.4

parents 2443e809 49dfa5a1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
3rdparty/include/opencl/1.2/CL/cl.hpp
View file @ 2fde4d8a
......@@ -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>
......
modules/ocl/src/cl_runtime/cl_runtime.cpp
View file @ 2fde4d8a
......@@ -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>
......
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
View file @ 2fde4d8a
......@@ -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>
......
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
View file @ 2fde4d8a
......@@ -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>
......
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
View file @ 2fde4d8a
......@@ -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>
......
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
View file @ 2fde4d8a
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment