Merge pull request from janm399:2.4

This commit is contained in:
Vadim Pisarevsky 2013-05-28 22:05:14 +04:00 committed by OpenCV Buildbot
commit 2ccdf56119
2 changed files with 2 additions and 2 deletions
modules/ocl
include/opencv2/ocl/private
src

@ -49,7 +49,7 @@
#include "opencv2/ocl/ocl.hpp"
#if defined __APPLE__
#include <OpenCL/OpenCL.h>
#include <OpenCL/opencl.h>
#else
#include <CL/opencl.h>
#endif

@ -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