[gegl/soc-2012-ops] removing "OpenCL/" includes in cl headers for Apple (Bug 673969)
- From: Maxime Nicco <maxnicco src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl/soc-2012-ops] removing "OpenCL/" includes in cl headers for Apple (Bug 673969)
- Date: Wed, 11 Jul 2012 18:29:26 +0000 (UTC)
commit d03cc92d4f1e9961cfee7fab65fffa4164dbd1b4
Author: Victor Oliveira <victormatheus gmail com>
Date: Sun Jul 1 14:18:21 2012 -0700
removing "OpenCL/" includes in cl headers for Apple (Bug 673969)
that's the point of having them in our code after all.
gegl/opencl/cl.h | 4 ----
gegl/opencl/cl_ext.h | 4 ++--
gegl/opencl/cl_gl.h | 2 +-
gegl/opencl/cl_gl_ext.h | 6 +-----
4 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/gegl/opencl/cl.h b/gegl/opencl/cl.h
index c68f985..cfae62f 100644
--- a/gegl/opencl/cl.h
+++ b/gegl/opencl/cl.h
@@ -26,11 +26,7 @@
#ifndef __OPENCL_CL_H
#define __OPENCL_CL_H
-#ifdef __APPLE__
-#include <OpenCL/cl_platform.h>
-#else
#include "cl_platform.h"
-#endif
#ifdef __cplusplus
extern "C" {
diff --git a/gegl/opencl/cl_ext.h b/gegl/opencl/cl_ext.h
index be80e74..c0bdffa 100644
--- a/gegl/opencl/cl_ext.h
+++ b/gegl/opencl/cl_ext.h
@@ -34,8 +34,8 @@ extern "C" {
#endif
#ifdef __APPLE__
- #include <OpenCL/cl.h>
- #include <AvailabilityMacros.h>
+ #include "cl.h"
+ #include <AvailabilityMacros.h>
#else
#include "cl.h"
#endif
diff --git a/gegl/opencl/cl_gl.h b/gegl/opencl/cl_gl.h
index ae87c4e..d8eb20d 100644
--- a/gegl/opencl/cl_gl.h
+++ b/gegl/opencl/cl_gl.h
@@ -33,7 +33,7 @@
#define __OPENCL_CL_GL_H
#ifdef __APPLE__
-#include <OpenCL/cl.h>
+#include "cl.h"
#include <OpenGL/CGLDevice.h>
#else
#include "cl.h"
diff --git a/gegl/opencl/cl_gl_ext.h b/gegl/opencl/cl_gl_ext.h
index c8a8293..1e239c3 100644
--- a/gegl/opencl/cl_gl_ext.h
+++ b/gegl/opencl/cl_gl_ext.h
@@ -33,11 +33,7 @@
extern "C" {
#endif
-#ifdef __APPLE__
- #include <OpenCL/cl_gl.h>
-#else
- #include "cl_gl.h"
-#endif
+#include "cl_gl.h"
/*
* For each extension, follow this template
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]