[gegl/gsoc2011-opencl: 20/21] Reorganizing headers

[Victor Matheus de Araujo Oliveira <vmaolive src gnome org>]

commit 87c82948cdbe1d9d6eed8c169c1358e45ed2fcb9
Author: Victor Oliveira <victormatheus gmail com>
Date:   Wed Oct 26 13:53:01 2011 -0200

    Reorganizing headers

 gegl/buffer/gegl-buffer-iterator.h |    3 +--
 gegl/buffer/gegl-buffer.h          |    3 +--
 gegl/gegl-types.h                  |    3 +--
 gegl/opencl/CL/cl_gl_ext.h         |    2 +-
 gegl/opencl/gegl-cl-texture.h      |    2 --
 gegl/opencl/gegl-cl-types.h        |    2 ++
 6 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/gegl/buffer/gegl-buffer-iterator.h b/gegl/buffer/gegl-buffer-iterator.h
index 682eeef..4ed89a1 100644
--- a/gegl/buffer/gegl-buffer-iterator.h
+++ b/gegl/buffer/gegl-buffer-iterator.h
@@ -22,8 +22,7 @@
 
 #include "gegl-buffer.h"
 
-#include "gegl-cl-init.h"
-#include "gegl-cl-texture.h"
+#include "gegl-cl-types.h"
 
 #define GEGL_BUFFER_MAX_ITERATORS 6
 
diff --git a/gegl/buffer/gegl-buffer.h b/gegl/buffer/gegl-buffer.h
index 8862102..22c52d2 100644
--- a/gegl/buffer/gegl-buffer.h
+++ b/gegl/buffer/gegl-buffer.h
@@ -23,8 +23,7 @@
 #include <babl/babl.h>
 #include <gegl-matrix.h>
 
-#include "gegl-cl-init.h"
-#include "gegl-cl-texture.h"
+#include <gegl-cl-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gegl/gegl-types.h b/gegl/gegl-types.h
index ee333cf..b8e8c25 100644
--- a/gegl/gegl-types.h
+++ b/gegl/gegl-types.h
@@ -22,8 +22,7 @@
 
 #include "gegl-enums.h"
 
-#include "gegl-cl-init.h"
-#include "gegl-cl-texture.h"
+#include "gegl-cl-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/gegl/opencl/CL/cl_gl_ext.h b/gegl/opencl/CL/cl_gl_ext.h
index 6b05e2e..33d0fb2 100644
--- a/gegl/opencl/CL/cl_gl_ext.h
+++ b/gegl/opencl/CL/cl_gl_ext.h
@@ -41,7 +41,7 @@ extern "C" {
 
 /*
  * For each extension, follow this template
- * /* cl_VEN_extname extension  */
+ * cl_VEN_extname extension  */
 /* #define cl_VEN_extname 1
  * ... define new types, if any
  * ... define new tokens, if any
diff --git a/gegl/opencl/gegl-cl-texture.h b/gegl/opencl/gegl-cl-texture.h
index e916324..dc71151 100644
--- a/gegl/opencl/gegl-cl-texture.h
+++ b/gegl/opencl/gegl-cl-texture.h
@@ -17,8 +17,6 @@ struct _GeglClTexture
   gint height;
 };
 
-typedef struct _GeglClTexture GeglClTexture;
-
 GType           gegl_cl_texture_get_type (void) G_GNUC_CONST;
 
 GeglClTexture  *gegl_cl_texture_new      (const gint           width,
diff --git a/gegl/opencl/gegl-cl-types.h b/gegl/opencl/gegl-cl-types.h
index 529171c..b4876d9 100644
--- a/gegl/opencl/gegl-cl-types.h
+++ b/gegl/opencl/gegl-cl-types.h
@@ -8,6 +8,8 @@
 #include <CL/cl_gl_ext.h>
 #include <CL/cl_ext.h>
 
+typedef struct _GeglClTexture GeglClTexture;
+
 typedef cl_int (*t_clGetPlatformIDs)  (cl_uint, cl_platform_id *, cl_uint *);
 typedef cl_int (*t_clGetPlatformInfo) (cl_platform_id, cl_platform_info, size_t, void *, size_t *);
 typedef cl_int (*t_clGetDeviceIDs)    (cl_platform_id, cl_device_type, cl_uint, cl_device_id *, cl_uint *);