From 0163a0b0cdec25203b1168487ce41a6b2d689cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 18 May 2018 16:43:02 +0200 Subject: [PATCH] cogl: Unconditionally include cogl-config.h --- cogl/cogl-pango/cogl-pango-display-list.c | 2 -- cogl/cogl-pango/cogl-pango-fontmap.c | 2 -- cogl/cogl-pango/cogl-pango-glyph-cache.c | 2 -- cogl/cogl-pango/cogl-pango-pipeline-cache.c | 2 -- cogl/cogl-pango/cogl-pango-render.c | 2 -- cogl/cogl-path/cogl-path-enum-types.c.in | 2 -- cogl/cogl/cogl-atlas-texture.c | 2 -- cogl/cogl/cogl-atlas.c | 2 -- cogl/cogl/cogl-attribute-buffer.c | 2 -- cogl/cogl/cogl-attribute.c | 2 -- cogl/cogl/cogl-bitmap-conversion.c | 2 -- cogl/cogl/cogl-bitmap-pixbuf.c | 2 -- cogl/cogl/cogl-bitmap.c | 2 -- cogl/cogl/cogl-blend-string.c | 2 -- cogl/cogl/cogl-blit.c | 2 -- cogl/cogl/cogl-boxed-value.c | 2 -- cogl/cogl/cogl-buffer.c | 2 -- cogl/cogl/cogl-clip-stack.c | 2 -- cogl/cogl/cogl-color.c | 2 -- cogl/cogl/cogl-config.c | 2 -- cogl/cogl/cogl-context.c | 2 -- cogl/cogl/cogl-debug.c | 2 -- cogl/cogl/cogl-depth-state.c | 2 -- cogl/cogl/cogl-display.c | 2 -- cogl/cogl/cogl-error.c | 2 -- cogl/cogl/cogl-euler.c | 2 -- cogl/cogl/cogl-feature-private.c | 2 -- cogl/cogl/cogl-fence.c | 2 -- cogl/cogl/cogl-frame-info.c | 2 -- cogl/cogl/cogl-framebuffer.c | 2 -- cogl/cogl/cogl-gles2-context.c | 2 -- cogl/cogl/cogl-glib-source.c | 2 -- cogl/cogl/cogl-glsl-shader.c | 2 -- cogl/cogl/cogl-gpu-info.c | 2 -- cogl/cogl/cogl-index-buffer.c | 2 -- cogl/cogl/cogl-indices.c | 2 -- cogl/cogl/cogl-journal.c | 2 -- cogl/cogl/cogl-list.c | 2 -- cogl/cogl/cogl-magazine.c | 2 -- cogl/cogl/cogl-matrix-stack.c | 2 -- cogl/cogl/cogl-matrix.c | 2 -- cogl/cogl/cogl-memory-stack.c | 2 -- cogl/cogl/cogl-meta-texture.c | 2 -- cogl/cogl/cogl-node.c | 2 -- cogl/cogl/cogl-object.c | 2 -- cogl/cogl/cogl-onscreen-template.c | 2 -- cogl/cogl/cogl-onscreen.c | 2 -- cogl/cogl/cogl-output.c | 2 -- cogl/cogl/cogl-pipeline-cache.c | 2 -- cogl/cogl/cogl-pipeline-debug.c | 2 -- cogl/cogl/cogl-pipeline-hash-table.c | 2 -- cogl/cogl/cogl-pipeline-layer-state.c | 2 -- cogl/cogl/cogl-pipeline-layer.c | 2 -- cogl/cogl/cogl-pipeline-snippet.c | 2 -- cogl/cogl/cogl-pipeline-state.c | 2 -- cogl/cogl/cogl-pipeline.c | 2 -- cogl/cogl/cogl-pixel-buffer.c | 2 -- cogl/cogl/cogl-point-in-poly.c | 2 -- cogl/cogl/cogl-poll.c | 2 -- cogl/cogl/cogl-primitive-texture.c | 2 -- cogl/cogl/cogl-primitive.c | 2 -- cogl/cogl/cogl-primitives.c | 2 -- cogl/cogl/cogl-profile.c | 2 -- cogl/cogl/cogl-quaternion.c | 2 -- cogl/cogl/cogl-rectangle-map.c | 2 -- cogl/cogl/cogl-renderer.c | 2 -- cogl/cogl/cogl-sampler-cache.c | 2 -- cogl/cogl/cogl-snippet.c | 2 -- cogl/cogl/cogl-spans.c | 2 -- cogl/cogl/cogl-sub-texture.c | 2 -- cogl/cogl/cogl-swap-chain.c | 2 -- cogl/cogl/cogl-texture-2d-sliced.c | 2 -- cogl/cogl/cogl-texture-2d.c | 2 -- cogl/cogl/cogl-texture-3d.c | 2 -- cogl/cogl/cogl-texture-rectangle.c | 2 -- cogl/cogl/cogl-texture.c | 2 -- cogl/cogl/cogl-util.c | 2 -- cogl/cogl/cogl-vector.c | 2 -- cogl/cogl/cogl-xlib-renderer.c | 2 -- cogl/cogl/cogl-xlib.c | 2 -- cogl/cogl/deprecated/cogl-clutter.c | 2 -- cogl/cogl/deprecated/cogl-material-compat.c | 2 -- cogl/cogl/deprecated/cogl-program.c | 3 --- cogl/cogl/deprecated/cogl-shader.c | 2 -- cogl/cogl/deprecated/cogl-vertex-buffer.c | 2 -- cogl/cogl/driver/gl/cogl-attribute-gl.c | 2 -- cogl/cogl/driver/gl/cogl-buffer-gl.c | 2 -- cogl/cogl/driver/gl/cogl-clip-stack-gl.c | 2 -- cogl/cogl/driver/gl/cogl-framebuffer-gl.c | 2 -- cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c | 2 -- cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c | 2 -- cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c | 2 -- cogl/cogl/driver/gl/cogl-texture-gl.c | 2 -- cogl/cogl/driver/gl/cogl-util-gl.c | 2 -- cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 2 -- cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c | 2 -- cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 2 -- cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c | 2 -- cogl/cogl/driver/nop/cogl-attribute-nop.c | 2 -- cogl/cogl/driver/nop/cogl-clip-stack-nop.c | 2 -- cogl/cogl/driver/nop/cogl-driver-nop.c | 2 -- cogl/cogl/driver/nop/cogl-framebuffer-nop.c | 2 -- cogl/cogl/driver/nop/cogl-texture-2d-nop.c | 2 -- cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 2 -- cogl/cogl/winsys/cogl-winsys-egl-x11.c | 2 -- cogl/cogl/winsys/cogl-winsys-egl.c | 2 -- cogl/cogl/winsys/cogl-winsys-glx.c | 2 -- cogl/cogl/winsys/cogl-winsys-stub.c | 2 -- cogl/cogl/winsys/cogl-winsys.c | 2 -- 109 files changed, 219 deletions(-) diff --git a/cogl/cogl-pango/cogl-pango-display-list.c b/cogl/cogl-pango/cogl-pango-display-list.c index e8332b95c..b2b254964 100644 --- a/cogl/cogl-pango/cogl-pango-display-list.c +++ b/cogl/cogl-pango/cogl-pango-display-list.c @@ -26,9 +26,7 @@ * SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c index 145f3b9e8..f39987a7a 100644 --- a/cogl/cogl-pango/cogl-pango-fontmap.c +++ b/cogl/cogl-pango/cogl-pango-fontmap.c @@ -34,9 +34,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif /* This is needed to get the Pango headers to export stuff needed to subclass */ diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.c b/cogl/cogl-pango/cogl-pango-glyph-cache.c index 038db7d6d..a5f2e8c88 100644 --- a/cogl/cogl-pango/cogl-pango-glyph-cache.c +++ b/cogl/cogl-pango/cogl-pango-glyph-cache.c @@ -26,9 +26,7 @@ * SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.c b/cogl/cogl-pango/cogl-pango-pipeline-cache.c index b0844876c..78fba0993 100644 --- a/cogl/cogl-pango/cogl-pango-pipeline-cache.c +++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include "cogl-pango-pipeline-cache.h" diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c index d8cc71306..55db8337c 100644 --- a/cogl/cogl-pango/cogl-pango-render.c +++ b/cogl/cogl-pango/cogl-pango-render.c @@ -33,9 +33,7 @@ * Matthew Allum */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #ifndef PANGO_ENABLE_BACKEND #define PANGO_ENABLE_BACKEND 1 diff --git a/cogl/cogl-path/cogl-path-enum-types.c.in b/cogl/cogl-path/cogl-path-enum-types.c.in index 661e81ca2..7209da80a 100644 --- a/cogl/cogl-path/cogl-path-enum-types.c.in +++ b/cogl/cogl-path/cogl-path-enum-types.c.in @@ -1,7 +1,5 @@ /*** BEGIN file-header ***/ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif /* We need to undefine this so that we will be sure to include * cogl-path.h instead of cogl2-path.h when we include the framebuffer diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c index 97bb84a6a..87a33b889 100644 --- a/cogl/cogl/cogl-atlas-texture.c +++ b/cogl/cogl/cogl-atlas-texture.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-debug.h" #include "cogl-util.h" diff --git a/cogl/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c index 023dff8b1..66c9ed607 100644 --- a/cogl/cogl/cogl-atlas.c +++ b/cogl/cogl/cogl-atlas.c @@ -29,9 +29,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-atlas.h" #include "cogl-rectangle-map.h" diff --git a/cogl/cogl/cogl-attribute-buffer.c b/cogl/cogl/cogl-attribute-buffer.c index dfc8e89f1..de00eb54b 100644 --- a/cogl/cogl/cogl-attribute-buffer.c +++ b/cogl/cogl/cogl-attribute-buffer.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-object-private.h" #include "cogl-attribute-buffer.h" diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c index 73fb07a15..d27d1bd49 100644 --- a/cogl/cogl/cogl-attribute.c +++ b/cogl/cogl/cogl-attribute.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c index 9748aca0c..9d20a47df 100644 --- a/cogl/cogl/cogl-bitmap-conversion.c +++ b/cogl/cogl/cogl-bitmap-conversion.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-private.h" #include "cogl-bitmap-private.h" diff --git a/cogl/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl/cogl-bitmap-pixbuf.c index 21b6fb443..0e4bc2036 100644 --- a/cogl/cogl/cogl-bitmap-pixbuf.c +++ b/cogl/cogl/cogl-bitmap-pixbuf.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-bitmap-private.h" diff --git a/cogl/cogl/cogl-bitmap.c b/cogl/cogl/cogl-bitmap.c index b395c4296..11d5ea413 100644 --- a/cogl/cogl/cogl-bitmap.c +++ b/cogl/cogl/cogl-bitmap.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-debug.h" diff --git a/cogl/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c index 659152d21..696787249 100644 --- a/cogl/cogl/cogl-blend-string.c +++ b/cogl/cogl/cogl-blend-string.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-blit.c b/cogl/cogl/cogl-blit.c index af78e215a..7a307aa78 100644 --- a/cogl/cogl/cogl-blit.c +++ b/cogl/cogl/cogl-blit.c @@ -29,9 +29,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-boxed-value.c b/cogl/cogl/cogl-boxed-value.c index fb8f27b68..c3faaa791 100644 --- a/cogl/cogl/cogl-boxed-value.c +++ b/cogl/cogl/cogl-boxed-value.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c index 18a6a4b21..db162f229 100644 --- a/cogl/cogl/cogl-buffer.c +++ b/cogl/cogl/cogl-buffer.c @@ -37,9 +37,7 @@ * Pixel Buffers API. */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c index 128b1bc85..232dddfdb 100644 --- a/cogl/cogl/cogl-clip-stack.c +++ b/cogl/cogl/cogl-clip-stack.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-color.c b/cogl/cogl/cogl-color.c index 631ec4a9a..a0c673dad 100644 --- a/cogl/cogl/cogl-color.c +++ b/cogl/cogl/cogl-color.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-config.c b/cogl/cogl/cogl-config.c index 032dc37f7..85592e930 100644 --- a/cogl/cogl/cogl-config.c +++ b/cogl/cogl/cogl-config.c @@ -30,9 +30,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-debug.h" #include "cogl-config-private.h" diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c index 40a490e8f..7895b8c4b 100644 --- a/cogl/cogl/cogl-context.c +++ b/cogl/cogl/cogl-context.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-object.h" #include "cogl-private.h" diff --git a/cogl/cogl/cogl-debug.c b/cogl/cogl/cogl-debug.c index dc2f9f9c6..42a8356a7 100644 --- a/cogl/cogl/cogl-debug.c +++ b/cogl/cogl/cogl-debug.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-depth-state.c b/cogl/cogl/cogl-depth-state.c index 8346d4c6c..a4fcebe0e 100644 --- a/cogl/cogl/cogl-depth-state.c +++ b/cogl/cogl/cogl-depth-state.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-depth-state-private.h" diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c index 81d3d8458..1166e416d 100644 --- a/cogl/cogl/cogl-display.c +++ b/cogl/cogl/cogl-display.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-error.c b/cogl/cogl/cogl-error.c index 623ab1b86..811f3b01d 100644 --- a/cogl/cogl/cogl-error.c +++ b/cogl/cogl/cogl-error.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-types.h" #include "cogl-util.h" diff --git a/cogl/cogl/cogl-euler.c b/cogl/cogl/cogl-euler.c index 7af6ea057..2c9e3f371 100644 --- a/cogl/cogl/cogl-euler.c +++ b/cogl/cogl/cogl-euler.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-feature-private.c b/cogl/cogl/cogl-feature-private.c index 29c470c59..a374aa534 100644 --- a/cogl/cogl/cogl-feature-private.c +++ b/cogl/cogl/cogl-feature-private.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c index f1209be36..37e3d4045 100644 --- a/cogl/cogl/cogl-fence.c +++ b/cogl/cogl/cogl-fence.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-fence.h" #include "cogl-fence-private.h" diff --git a/cogl/cogl/cogl-frame-info.c b/cogl/cogl/cogl-frame-info.c index 4e7ac3aee..0455db1c1 100644 --- a/cogl/cogl/cogl-frame-info.c +++ b/cogl/cogl/cogl-frame-info.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-frame-info-private.h" #include "cogl-gtype-private.h" diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c index 55b9e3756..6f1239f1e 100644 --- a/cogl/cogl/cogl-framebuffer.c +++ b/cogl/cogl/cogl-framebuffer.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-gles2-context.c b/cogl/cogl/cogl-gles2-context.c index 78d423f08..58efc7eaa 100644 --- a/cogl/cogl/cogl-gles2-context.c +++ b/cogl/cogl/cogl-gles2-context.c @@ -33,9 +33,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c index b0b0ac566..fa6d10a08 100644 --- a/cogl/cogl/cogl-glib-source.c +++ b/cogl/cogl/cogl-glib-source.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-glib-source.h" #include "cogl-poll.h" diff --git a/cogl/cogl/cogl-glsl-shader.c b/cogl/cogl/cogl-glsl-shader.c index d728d99e6..ce5e639bf 100644 --- a/cogl/cogl/cogl-glsl-shader.c +++ b/cogl/cogl/cogl-glsl-shader.c @@ -32,9 +32,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-util-gl-private.h" diff --git a/cogl/cogl/cogl-gpu-info.c b/cogl/cogl/cogl-gpu-info.c index 23a846616..a7897b236 100644 --- a/cogl/cogl/cogl-gpu-info.c +++ b/cogl/cogl/cogl-gpu-info.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-index-buffer.c b/cogl/cogl/cogl-index-buffer.c index 1f9b59d8d..9333a2fef 100644 --- a/cogl/cogl/cogl-index-buffer.c +++ b/cogl/cogl/cogl-index-buffer.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-object-private.h" #include "cogl-indices.h" diff --git a/cogl/cogl/cogl-indices.c b/cogl/cogl/cogl-indices.c index 8ffcdc6f6..fc336b0b6 100644 --- a/cogl/cogl/cogl-indices.c +++ b/cogl/cogl/cogl-indices.c @@ -32,9 +32,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-object-private.h" diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c index 6b64a8931..956e36972 100644 --- a/cogl/cogl/cogl-journal.c +++ b/cogl/cogl/cogl-journal.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-debug.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-list.c b/cogl/cogl/cogl-list.c index 08e6a2402..9e855e5f9 100644 --- a/cogl/cogl/cogl-list.c +++ b/cogl/cogl/cogl-list.c @@ -23,9 +23,7 @@ /* This list implementation is based on the Wayland source code */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-magazine.c b/cogl/cogl/cogl-magazine.c index 89c91226b..be5669d81 100644 --- a/cogl/cogl/cogl-magazine.c +++ b/cogl/cogl/cogl-magazine.c @@ -51,9 +51,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-memory-stack-private.h" #include "cogl-magazine-private.h" diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c index 3d45ab96e..fe4d27af3 100644 --- a/cogl/cogl/cogl-matrix-stack.c +++ b/cogl/cogl/cogl-matrix-stack.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-util-gl-private.h" diff --git a/cogl/cogl/cogl-matrix.c b/cogl/cogl/cogl-matrix.c index 7c01a0bd8..c03de61ad 100644 --- a/cogl/cogl/cogl-matrix.c +++ b/cogl/cogl/cogl-matrix.c @@ -69,9 +69,7 @@ * the inverse of the identity matrix) */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-memory-stack.c b/cogl/cogl/cogl-memory-stack.c index a7c3ee3b5..b44e3bac4 100644 --- a/cogl/cogl/cogl-memory-stack.c +++ b/cogl/cogl/cogl-memory-stack.c @@ -54,9 +54,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-memory-stack-private.h" #include "cogl-list.h" diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c index ed1226924..43f1ce472 100644 --- a/cogl/cogl/cogl-meta-texture.c +++ b/cogl/cogl/cogl-meta-texture.c @@ -30,9 +30,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-texture.h" #include "cogl-matrix.h" diff --git a/cogl/cogl/cogl-node.c b/cogl/cogl/cogl-node.c index dcec3cca7..b55bcb086 100644 --- a/cogl/cogl/cogl-node.c +++ b/cogl/cogl/cogl-node.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-node-private.h" diff --git a/cogl/cogl/cogl-object.c b/cogl/cogl/cogl-object.c index e159c6c3a..b411a2c17 100644 --- a/cogl/cogl/cogl-object.c +++ b/cogl/cogl/cogl-object.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-onscreen-template.c b/cogl/cogl/cogl-onscreen-template.c index 1adbf4128..0e7bd1e20 100644 --- a/cogl/cogl/cogl-onscreen-template.c +++ b/cogl/cogl/cogl-onscreen-template.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-object.h" diff --git a/cogl/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c index e766e59d0..4e01d133d 100644 --- a/cogl/cogl/cogl-onscreen.c +++ b/cogl/cogl/cogl-onscreen.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-onscreen-private.h" diff --git a/cogl/cogl/cogl-output.c b/cogl/cogl/cogl-output.c index 573e8dc9f..e2c005076 100644 --- a/cogl/cogl/cogl-output.c +++ b/cogl/cogl/cogl-output.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-output-private.h" #include "cogl-gtype-private.h" diff --git a/cogl/cogl/cogl-pipeline-cache.c b/cogl/cogl/cogl-pipeline-cache.c index 62b372406..216add80f 100644 --- a/cogl/cogl/cogl-pipeline-cache.c +++ b/cogl/cogl/cogl-pipeline-cache.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-pipeline-debug.c b/cogl/cogl/cogl-pipeline-debug.c index 0e4f6cd42..dc148b75a 100644 --- a/cogl/cogl/cogl-pipeline-debug.c +++ b/cogl/cogl/cogl-pipeline-debug.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-pipeline-private.h" diff --git a/cogl/cogl/cogl-pipeline-hash-table.c b/cogl/cogl/cogl-pipeline-hash-table.c index 8f961b030..af0d00084 100644 --- a/cogl/cogl/cogl-pipeline-hash-table.c +++ b/cogl/cogl/cogl-pipeline-hash-table.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-pipeline-private.h" diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c index c30fae996..3e2ee01f6 100644 --- a/cogl/cogl/cogl-pipeline-layer-state.c +++ b/cogl/cogl/cogl-pipeline-layer-state.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-pipeline-private.h" diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c index c7a3d5ec5..055ab451a 100644 --- a/cogl/cogl/cogl-pipeline-layer.c +++ b/cogl/cogl/cogl-pipeline-layer.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-pipeline-snippet.c b/cogl/cogl/cogl-pipeline-snippet.c index 18aefc790..3f8c5c6d8 100644 --- a/cogl/cogl/cogl-pipeline-snippet.c +++ b/cogl/cogl/cogl-pipeline-snippet.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-pipeline-state.c b/cogl/cogl/cogl-pipeline-state.c index 0fd41b470..17fa8fe24 100644 --- a/cogl/cogl/cogl-pipeline-state.c +++ b/cogl/cogl/cogl-pipeline-state.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-color-private.h" diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c index d18b9f52a..842af5469 100644 --- a/cogl/cogl/cogl-pipeline.c +++ b/cogl/cogl/cogl-pipeline.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-debug.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c index 348f74a21..7deb0f504 100644 --- a/cogl/cogl/cogl-pixel-buffer.c +++ b/cogl/cogl/cogl-pixel-buffer.c @@ -37,9 +37,7 @@ * Pixel Buffers API. */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-point-in-poly.c b/cogl/cogl/cogl-point-in-poly.c index 64bbd30b5..c80fcbaca 100644 --- a/cogl/cogl/cogl-point-in-poly.c +++ b/cogl/cogl/cogl-point-in-poly.c @@ -34,9 +34,7 @@ * http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-point-in-poly-private.h" diff --git a/cogl/cogl/cogl-poll.c b/cogl/cogl/cogl-poll.c index d0926e3d8..b1e581011 100644 --- a/cogl/cogl/cogl-poll.c +++ b/cogl/cogl/cogl-poll.c @@ -30,9 +30,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-poll.h" #include "cogl-poll-private.h" diff --git a/cogl/cogl/cogl-primitive-texture.c b/cogl/cogl/cogl-primitive-texture.c index ae913d1c9..754567355 100644 --- a/cogl/cogl/cogl-primitive-texture.c +++ b/cogl/cogl/cogl-primitive-texture.c @@ -30,9 +30,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-primitive-texture.h" #include "cogl-texture-private.h" diff --git a/cogl/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c index 728d94f5e..f1db751a7 100644 --- a/cogl/cogl/cogl-primitive.c +++ b/cogl/cogl/cogl-primitive.c @@ -31,9 +31,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-object-private.h" diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c index d14186f5c..13d457ad2 100644 --- a/cogl/cogl/cogl-primitives.c +++ b/cogl/cogl/cogl-primitives.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-debug.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-profile.c b/cogl/cogl/cogl-profile.c index d5bca6a20..5099c333d 100644 --- a/cogl/cogl/cogl-profile.c +++ b/cogl/cogl/cogl-profile.c @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #ifdef COGL_ENABLE_PROFILE diff --git a/cogl/cogl/cogl-quaternion.c b/cogl/cogl/cogl-quaternion.c index d380cec84..8b747f48d 100644 --- a/cogl/cogl/cogl-quaternion.c +++ b/cogl/cogl/cogl-quaternion.c @@ -39,9 +39,7 @@ * 3D Maths Primer for Graphics and Game Development ISBN-10: 1556229119 */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-rectangle-map.c b/cogl/cogl/cogl-rectangle-map.c index 37eb089d2..5a0b3ddbf 100644 --- a/cogl/cogl/cogl-rectangle-map.c +++ b/cogl/cogl/cogl-rectangle-map.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c index bee7bdb72..f45c6586b 100644 --- a/cogl/cogl/cogl-renderer.c +++ b/cogl/cogl/cogl-renderer.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-sampler-cache.c b/cogl/cogl/cogl-sampler-cache.c index 1f9212010..bb20686e6 100644 --- a/cogl/cogl/cogl-sampler-cache.c +++ b/cogl/cogl/cogl-sampler-cache.c @@ -30,9 +30,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-sampler-cache-private.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/cogl-snippet.c b/cogl/cogl/cogl-snippet.c index c5a79402a..603074942 100644 --- a/cogl/cogl/cogl-snippet.c +++ b/cogl/cogl/cogl-snippet.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-types.h" #include "cogl-snippet-private.h" diff --git a/cogl/cogl/cogl-spans.c b/cogl/cogl/cogl-spans.c index 85f8e01eb..3f275dcfa 100644 --- a/cogl/cogl/cogl-spans.c +++ b/cogl/cogl/cogl-spans.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "math.h" diff --git a/cogl/cogl/cogl-sub-texture.c b/cogl/cogl/cogl-sub-texture.c index 9d7abea90..c6ceec7d8 100644 --- a/cogl/cogl/cogl-sub-texture.c +++ b/cogl/cogl/cogl-sub-texture.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-texture-private.h" diff --git a/cogl/cogl/cogl-swap-chain.c b/cogl/cogl/cogl-swap-chain.c index 558dad230..fbec88ea7 100644 --- a/cogl/cogl/cogl-swap-chain.c +++ b/cogl/cogl/cogl-swap-chain.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-object.h" diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c index 4f586cde7..715f7bc46 100644 --- a/cogl/cogl/cogl-texture-2d-sliced.c +++ b/cogl/cogl/cogl-texture-2d-sliced.c @@ -33,9 +33,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-debug.h" #include "cogl-private.h" diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c index 663125890..dc57aee28 100644 --- a/cogl/cogl/cogl-texture-2d.c +++ b/cogl/cogl/cogl-texture-2d.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-private.h" #include "cogl-util.h" diff --git a/cogl/cogl/cogl-texture-3d.c b/cogl/cogl/cogl-texture-3d.c index f177b0edf..119f4deca 100644 --- a/cogl/cogl/cogl-texture-3d.c +++ b/cogl/cogl/cogl-texture-3d.c @@ -29,9 +29,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-private.h" #include "cogl-util.h" diff --git a/cogl/cogl/cogl-texture-rectangle.c b/cogl/cogl/cogl-texture-rectangle.c index cc2e642d3..c15b20a02 100644 --- a/cogl/cogl/cogl-texture-rectangle.c +++ b/cogl/cogl/cogl-texture-rectangle.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-private.h" #include "cogl-util.h" diff --git a/cogl/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c index e2d37e225..c142221fa 100644 --- a/cogl/cogl/cogl-texture.c +++ b/cogl/cogl/cogl-texture.c @@ -34,9 +34,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-util.h" #include "cogl-bitmap.h" diff --git a/cogl/cogl/cogl-util.c b/cogl/cogl/cogl-util.c index c4cdb57f7..a2d887835 100644 --- a/cogl/cogl/cogl-util.c +++ b/cogl/cogl/cogl-util.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/cogl-vector.c b/cogl/cogl/cogl-vector.c index e98d01b96..31f65581a 100644 --- a/cogl/cogl/cogl-vector.c +++ b/cogl/cogl/cogl-vector.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c index 66fe0e595..fe5b6d9a2 100644 --- a/cogl/cogl/cogl-xlib-renderer.c +++ b/cogl/cogl/cogl-xlib-renderer.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-xlib-renderer.h" #include "cogl-util.h" diff --git a/cogl/cogl/cogl-xlib.c b/cogl/cogl/cogl-xlib.c index c381035b6..4b10f518c 100644 --- a/cogl/cogl/cogl-xlib.c +++ b/cogl/cogl/cogl-xlib.c @@ -30,9 +30,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c index 6c972f2bd..20b1da2a7 100644 --- a/cogl/cogl/deprecated/cogl-clutter.c +++ b/cogl/cogl/deprecated/cogl-clutter.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c index 3084225c1..e4006ca71 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.c +++ b/cogl/cogl/deprecated/cogl-material-compat.c @@ -29,9 +29,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c index f44d72561..0df1ccce0 100644 --- a/cogl/cogl/deprecated/cogl-program.c +++ b/cogl/cogl/deprecated/cogl-program.c @@ -28,10 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif - #include "cogl-util.h" #include "cogl-util-gl-private.h" diff --git a/cogl/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c index e4497a70d..f57fee232 100644 --- a/cogl/cogl/deprecated/cogl-shader.c +++ b/cogl/cogl/deprecated/cogl-shader.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-shader-private.h" #include "cogl-util-gl-private.h" diff --git a/cogl/cogl/deprecated/cogl-vertex-buffer.c b/cogl/cogl/deprecated/cogl-vertex-buffer.c index cf6e51ea2..57325a677 100644 --- a/cogl/cogl/deprecated/cogl-vertex-buffer.c +++ b/cogl/cogl/deprecated/cogl-vertex-buffer.c @@ -95,9 +95,7 @@ * "MVert", "MFace" and "MEdge" primitives. */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include #include diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c index 96873d5ac..caf62c56f 100644 --- a/cogl/cogl/driver/gl/cogl-attribute-gl.c +++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c @@ -32,9 +32,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c index 98300cf15..c652c8c42 100644 --- a/cogl/cogl/driver/gl/cogl-buffer-gl.c +++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c @@ -32,9 +32,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-buffer-gl-private.h" diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c index 191214b57..8f494bedf 100644 --- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c +++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c @@ -32,9 +32,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-util-gl-private.h" diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c index abff84ee0..aafbf2aa9 100644 --- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c +++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h" #include "cogl-util-gl-private.h" diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c index c255bf9b6..52d89825e 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c @@ -32,9 +32,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c index 3db53424b..69426dd44 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c index 638611072..772d018f6 100644 --- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c +++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/gl/cogl-texture-gl.c b/cogl/cogl/driver/gl/cogl-texture-gl.c index d491a45a4..81cf70df8 100644 --- a/cogl/cogl/driver/gl/cogl-texture-gl.c +++ b/cogl/cogl/driver/gl/cogl-texture-gl.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c index 25e490318..40f0a399f 100644 --- a/cogl/cogl/driver/gl/cogl-util-gl.c +++ b/cogl/cogl/driver/gl/cogl-util-gl.c @@ -30,9 +30,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-types.h" #include "cogl-context-private.h" diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c index b46a7a8a2..573b809cf 100644 --- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c index 036b04c3d..b562c27d9 100644 --- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c @@ -33,9 +33,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-private.h" #include "cogl-util.h" diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c index 346d4e36d..e9486d958 100644 --- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c index 1f62ade67..a9d8a7b4f 100644 --- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c @@ -33,9 +33,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-private.h" #include "cogl-util.h" diff --git a/cogl/cogl/driver/nop/cogl-attribute-nop.c b/cogl/cogl/driver/nop/cogl-attribute-nop.c index dcb689120..40b6d5e7c 100644 --- a/cogl/cogl/driver/nop/cogl-attribute-nop.c +++ b/cogl/cogl/driver/nop/cogl-attribute-nop.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-types.h" #include "cogl-framebuffer.h" diff --git a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c index 441dd6e1d..3469965fb 100644 --- a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c +++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-clip-stack.h" #include "cogl-clip-stack-nop-private.h" diff --git a/cogl/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c index 6e04e7164..cdde59b56 100644 --- a/cogl/cogl/driver/nop/cogl-driver-nop.c +++ b/cogl/cogl/driver/nop/cogl-driver-nop.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c index 2e730e418..66550c5cc 100644 --- a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c +++ b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-framebuffer-nop-private.h" diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c index 539048a7c..5a37fa1ad 100644 --- a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c +++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c @@ -32,9 +32,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c index d03040c24..91e1f557e 100644 --- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c +++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c @@ -33,9 +33,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-debug.h" #include "cogl-util.h" diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c index c1d01dccd..eae080006 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c +++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c @@ -31,9 +31,7 @@ * Neil Roberts */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c index b785e9c91..7a6a70966 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl.c +++ b/cogl/cogl/winsys/cogl-winsys-egl.c @@ -30,9 +30,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-i18n-private.h" #include "cogl-util.h" diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c index 74b0895d1..fb2374c35 100644 --- a/cogl/cogl/winsys/cogl-winsys-glx.c +++ b/cogl/cogl/winsys/cogl-winsys-glx.c @@ -30,9 +30,7 @@ * Robert Bragg */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-i18n-private.h" #include "cogl-util.h" diff --git a/cogl/cogl/winsys/cogl-winsys-stub.c b/cogl/cogl/winsys/cogl-winsys-stub.c index ba49a9419..87f36cc32 100644 --- a/cogl/cogl/winsys/cogl-winsys-stub.c +++ b/cogl/cogl/winsys/cogl-winsys-stub.c @@ -31,9 +31,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-renderer-private.h" #include "cogl-display-private.h" diff --git a/cogl/cogl/winsys/cogl-winsys.c b/cogl/cogl/winsys/cogl-winsys.c index b0a7b68ca..d76c6e3fa 100644 --- a/cogl/cogl/winsys/cogl-winsys.c +++ b/cogl/cogl/winsys/cogl-winsys.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "cogl-config.h" -#endif #include "cogl-context-private.h"