Merge pull request #945 from malcolmreynolds:master

6e119049 · Vadim Pisarevsky · OpenCV Buildbot · d81d3fc8 · a9c9210b · 6e119049
Commit 6e119049 authored Jun 04, 2013 by Vadim Pisarevsky Committed by OpenCV Buildbot Jun 04, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

util.hpp modules/ocl/include/opencv2/ocl/private/util.hpp +1 -1

safe_call.hpp modules/ocl/src/safe_call.hpp +1 -1

No files found.
--- a/modules/ocl/include/opencv2/ocl/private/util.hpp
+++ b/modules/ocl/include/opencv2/ocl/private/util.hpp
@@ -47,7 +47,7 @@
 #define __OPENCV_OCL_PRIVATE_UTIL__

 #if defined __APPLE__
-#include <OpenCL/OpenCL.h>
+#include <OpenCL/opencl.h>
 #else
 #include <CL/opencl.h>
 #endif

--- a/modules/ocl/src/safe_call.hpp
+++ b/modules/ocl/src/safe_call.hpp
@@ -47,7 +47,7 @@
 #define __OPENCV_OPENCL_SAFE_CALL_HPP__

 #if defined __APPLE__
-#include <OpenCL/OpenCL.h>
+#include <OpenCL/opencl.h>
 #else
 #include <CL/cl.h>
 #endif