From 93d0de1d9acf03a99d5fc580cb64fc483983f197 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 20 Jun 2012 19:49:08 +0200 Subject: [PATCH] Mass rename CLUTTER_COMPILATION to COGL_COMPILATION Reviewed-by: Neil Roberts (cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6) --- build/win32/vs10/cogl.props | 4 ++-- build/win32/vs9/cogl.vsprops | 4 ++-- cogl-pango/Makefile.am | 2 +- cogl/Makefile.am | 2 +- cogl/cogl-attribute-buffer.h | 2 +- cogl/cogl-attribute.h | 2 +- cogl/cogl-bitmap.h | 2 +- cogl/cogl-buffer.h | 2 +- cogl/cogl-clip-state.h | 2 +- cogl/cogl-clutter-xlib.h | 2 +- cogl/cogl-clutter.h | 2 +- cogl/cogl-color.h | 2 +- cogl/cogl-context.h | 2 +- cogl/cogl-defines.h.in | 2 +- cogl/cogl-defines.h.win32.in | 2 +- cogl/cogl-defines.h.win32_SDL.in | 2 +- cogl/cogl-depth-state.h | 2 +- cogl/cogl-display.h | 2 +- cogl/cogl-euler.h | 2 +- cogl/cogl-fixed.h | 2 +- cogl/cogl-gl-header.h.in | 2 +- cogl/cogl-gl-header.h.win32 | 2 +- cogl/cogl-gles2.h | 2 +- cogl/cogl-glib-source.h | 2 +- cogl/cogl-index-buffer.h | 2 +- cogl/cogl-indices.h | 2 +- cogl/cogl-kms-display.h | 2 +- cogl/cogl-kms-renderer.h | 2 +- cogl/cogl-magazine-private.h | 2 +- cogl/cogl-material-compat.h | 2 +- cogl/cogl-memory-stack-private.h | 2 +- cogl/cogl-meta-texture.h | 2 +- cogl/cogl-offscreen.h | 2 +- cogl/cogl-onscreen-template.h | 2 +- cogl/cogl-onscreen.h | 2 +- cogl/cogl-path-functions.h | 2 +- cogl/cogl-path.h | 2 +- cogl/cogl-pipeline-layer-state.h | 2 +- cogl/cogl-pipeline-state.h | 2 +- cogl/cogl-pipeline.h | 2 +- cogl/cogl-pixel-buffer.h | 2 +- cogl/cogl-poll.h | 2 +- cogl/cogl-primitive-texture.h | 2 +- cogl/cogl-primitive.h | 2 +- cogl/cogl-quaternion.h | 2 +- cogl/cogl-renderer.h | 2 +- cogl/cogl-sdl.h | 2 +- cogl/cogl-shader.h | 2 +- cogl/cogl-snippet.h | 2 +- cogl/cogl-sub-texture.h | 2 +- cogl/cogl-swap-chain.h | 2 +- cogl/cogl-texture-2d.h | 2 +- cogl/cogl-texture-3d.h | 2 +- cogl/cogl-texture.h | 2 +- cogl/cogl-types.h | 4 ++-- cogl/cogl-vector.h | 2 +- cogl/cogl-vertex-buffer.h | 2 +- cogl/cogl-wayland-renderer.h | 2 +- cogl/cogl-win32-renderer.h | 2 +- cogl/cogl-xlib-renderer.h | 2 +- cogl/cogl1-context.h | 2 +- cogl/cogl2-compatibility.h | 2 +- cogl/cogl2-path.h | 2 +- tests/conform/Makefile.am | 2 +- tests/conform/test-no-gl-header.c | 2 +- 65 files changed, 68 insertions(+), 68 deletions(-) diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 3b32e1edd..950213b0b 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -5,12 +5,12 @@ ..\..\..\vs10\$(Platform) 1.0 _WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG - HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines) + HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines) $(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS _DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir" G_LOG_DOMAIN="Cogl-Pango" - CLUTTER_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests" + COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests" $(GlibEtcInstallRoot) if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index 4a77ec3e1..c7095b4ad 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -36,7 +36,7 @@ /> */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-attribute.h b/cogl/cogl-attribute.h index 701170779..60ffaba2c 100644 --- a/cogl/cogl-attribute.h +++ b/cogl/cogl-attribute.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-bitmap.h b/cogl/cogl-bitmap.h index 790030655..5f5674a5f 100644 --- a/cogl/cogl-bitmap.h +++ b/cogl/cogl-bitmap.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-buffer.h b/cogl/cogl-buffer.h index 4f073b105..5ad24b967 100644 --- a/cogl/cogl-buffer.h +++ b/cogl/cogl-buffer.h @@ -25,7 +25,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-clip-state.h b/cogl/cogl-clip-state.h index b51943f49..70cb63bf4 100644 --- a/cogl/cogl-clip-state.h +++ b/cogl/cogl-clip-state.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-clutter-xlib.h b/cogl/cogl-clutter-xlib.h index 766ceba51..6c08f5804 100644 --- a/cogl/cogl-clutter-xlib.h +++ b/cogl/cogl-clutter-xlib.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-clutter.h b/cogl/cogl-clutter.h index bd8e3c46b..26738887e 100644 --- a/cogl/cogl-clutter.h +++ b/cogl/cogl-clutter.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-color.h b/cogl/cogl-color.h index fe2dce111..5bd7936bc 100644 --- a/cogl/cogl-color.h +++ b/cogl/cogl-color.h @@ -31,7 +31,7 @@ * Since: 1.0 */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h index 757b1a874..616cd77cc 100644 --- a/cogl/cogl-context.h +++ b/cogl/cogl-context.h @@ -24,7 +24,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-defines.h.in b/cogl/cogl-defines.h.in index a9c0b5c7e..7c1c5aeba 100644 --- a/cogl/cogl-defines.h.in +++ b/cogl/cogl-defines.h.in @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-defines.h.win32.in b/cogl/cogl-defines.h.win32.in index b6e6d0466..da9cc5f95 100644 --- a/cogl/cogl-defines.h.win32.in +++ b/cogl/cogl-defines.h.win32.in @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-defines.h.win32_SDL.in b/cogl/cogl-defines.h.win32_SDL.in index 0cc9f9d05..dc9ea5d93 100644 --- a/cogl/cogl-defines.h.win32_SDL.in +++ b/cogl/cogl-defines.h.win32_SDL.in @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-depth-state.h b/cogl/cogl-depth-state.h index 71535bb77..072c6b0df 100644 --- a/cogl/cogl-depth-state.h +++ b/cogl/cogl-depth-state.h @@ -24,7 +24,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h index 7e5e4275b..463b99cbd 100644 --- a/cogl/cogl-display.h +++ b/cogl/cogl-display.h @@ -24,7 +24,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-euler.h b/cogl/cogl-euler.h index e30120230..a4c988d28 100644 --- a/cogl/cogl-euler.h +++ b/cogl/cogl-euler.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-fixed.h b/cogl/cogl-fixed.h index 0d71823b8..a1d6317f8 100644 --- a/cogl/cogl-fixed.h +++ b/cogl/cogl-fixed.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-gl-header.h.in b/cogl/cogl-gl-header.h.in index 30bc8376f..647d82b30 100644 --- a/cogl/cogl-gl-header.h.in +++ b/cogl/cogl-gl-header.h.in @@ -21,7 +21,7 @@ * */ -#if !defined(CLUTTER_COMPILATION) +#if !defined(COGL_COMPILATION) #error "cogl-gl-header.h should only be included when compiling Cogl" #endif diff --git a/cogl/cogl-gl-header.h.win32 b/cogl/cogl-gl-header.h.win32 index 710d1fab3..6f97147a5 100644 --- a/cogl/cogl-gl-header.h.win32 +++ b/cogl/cogl-gl-header.h.win32 @@ -21,7 +21,7 @@ * */ -#if !defined(CLUTTER_COMPILATION) +#if !defined(COGL_COMPILATION) #error "cogl-gl-header.h should only be included when compiling Cogl" #endif diff --git a/cogl/cogl-gles2.h b/cogl/cogl-gles2.h index 56ff64d14..34467b2e0 100644 --- a/cogl/cogl-gles2.h +++ b/cogl/cogl-gles2.h @@ -43,7 +43,7 @@ * conflicts we only expose the minimal set of GLES 2.0 types and enums * publicly. */ -#ifdef CLUTTER_COMPILATION +#ifdef COGL_COMPILATION #include "cogl-gl-header.h" #else #include diff --git a/cogl/cogl-glib-source.h b/cogl/cogl-glib-source.h index 6bd5dd46d..1ce7d7e71 100644 --- a/cogl/cogl-glib-source.h +++ b/cogl/cogl-glib-source.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-index-buffer.h b/cogl/cogl-index-buffer.h index 11481f2da..663e066a6 100644 --- a/cogl/cogl-index-buffer.h +++ b/cogl/cogl-index-buffer.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-indices.h b/cogl/cogl-indices.h index 62eca03b9..c13e425c9 100644 --- a/cogl/cogl-indices.h +++ b/cogl/cogl-indices.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-kms-display.h b/cogl/cogl-kms-display.h index 012f871d0..85ecc72eb 100644 --- a/cogl/cogl-kms-display.h +++ b/cogl/cogl-kms-display.h @@ -22,7 +22,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-kms-renderer.h b/cogl/cogl-kms-renderer.h index 68d126ebf..539fa788a 100644 --- a/cogl/cogl-kms-renderer.h +++ b/cogl/cogl-kms-renderer.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-magazine-private.h b/cogl/cogl-magazine-private.h index 07900ec46..16e5a61e8 100644 --- a/cogl/cogl-magazine-private.h +++ b/cogl/cogl-magazine-private.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-material-compat.h b/cogl/cogl-material-compat.h index 7b012fdf8..964fa4a6f 100644 --- a/cogl/cogl-material-compat.h +++ b/cogl/cogl-material-compat.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-memory-stack-private.h b/cogl/cogl-memory-stack-private.h index 858807ab5..d6d5a9ce6 100644 --- a/cogl/cogl-memory-stack-private.h +++ b/cogl/cogl-memory-stack-private.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-meta-texture.h b/cogl/cogl-meta-texture.h index dca9f5e6b..b896cd0e1 100644 --- a/cogl/cogl-meta-texture.h +++ b/cogl/cogl-meta-texture.h @@ -22,7 +22,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-offscreen.h b/cogl/cogl-offscreen.h index afb920b9f..e3ca11bbe 100644 --- a/cogl/cogl-offscreen.h +++ b/cogl/cogl-offscreen.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-onscreen-template.h b/cogl/cogl-onscreen-template.h index 948eaa155..7589b5f12 100644 --- a/cogl/cogl-onscreen-template.h +++ b/cogl/cogl-onscreen-template.h @@ -24,7 +24,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h index 339bdf303..a3f1d73a6 100644 --- a/cogl/cogl-onscreen.h +++ b/cogl/cogl-onscreen.h @@ -25,7 +25,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-path-functions.h b/cogl/cogl-path-functions.h index a443745c2..cb1250841 100644 --- a/cogl/cogl-path-functions.h +++ b/cogl/cogl-path-functions.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-path.h b/cogl/cogl-path.h index c3d0d4501..b29fdeef5 100644 --- a/cogl/cogl-path.h +++ b/cogl/cogl-path.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-pipeline-layer-state.h b/cogl/cogl-pipeline-layer-state.h index b808fa37b..39a475782 100644 --- a/cogl/cogl-pipeline-layer-state.h +++ b/cogl/cogl-pipeline-layer-state.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-pipeline-state.h b/cogl/cogl-pipeline-state.h index cfaec22d2..017204649 100644 --- a/cogl/cogl-pipeline-state.h +++ b/cogl/cogl-pipeline-state.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-pipeline.h b/cogl/cogl-pipeline.h index aa55f2400..67b777a09 100644 --- a/cogl/cogl-pipeline.h +++ b/cogl/cogl-pipeline.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-pixel-buffer.h b/cogl/cogl-pixel-buffer.h index 14e6f0f49..f02e38abc 100644 --- a/cogl/cogl-pixel-buffer.h +++ b/cogl/cogl-pixel-buffer.h @@ -25,7 +25,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-poll.h b/cogl/cogl-poll.h index a7647594a..2a319bd4e 100644 --- a/cogl/cogl-poll.h +++ b/cogl/cogl-poll.h @@ -24,7 +24,7 @@ * Neil Roberts */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-primitive-texture.h b/cogl/cogl-primitive-texture.h index db8cff48a..39c3c4163 100644 --- a/cogl/cogl-primitive-texture.h +++ b/cogl/cogl-primitive-texture.h @@ -22,7 +22,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-primitive.h b/cogl/cogl-primitive.h index 2a33e02f9..e6495b467 100644 --- a/cogl/cogl-primitive.h +++ b/cogl/cogl-primitive.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-quaternion.h b/cogl/cogl-quaternion.h index 7683633b0..650160382 100644 --- a/cogl/cogl-quaternion.h +++ b/cogl/cogl-quaternion.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h index 98fb05c98..c8bac6eba 100644 --- a/cogl/cogl-renderer.h +++ b/cogl/cogl-renderer.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-sdl.h b/cogl/cogl-sdl.h index e0f4f4c90..732beaf10 100644 --- a/cogl/cogl-sdl.h +++ b/cogl/cogl-sdl.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-shader.h b/cogl/cogl-shader.h index 00c1acd7f..ae9a2d0cf 100644 --- a/cogl/cogl-shader.h +++ b/cogl/cogl-shader.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-snippet.h b/cogl/cogl-snippet.h index 21911172d..f20cc9815 100644 --- a/cogl/cogl-snippet.h +++ b/cogl/cogl-snippet.h @@ -25,7 +25,7 @@ * Neil Roberts */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-sub-texture.h b/cogl/cogl-sub-texture.h index 05f924c64..8c27a95f7 100644 --- a/cogl/cogl-sub-texture.h +++ b/cogl/cogl-sub-texture.h @@ -24,7 +24,7 @@ * Neil Roberts */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-swap-chain.h b/cogl/cogl-swap-chain.h index df383f547..fafdaced2 100644 --- a/cogl/cogl-swap-chain.h +++ b/cogl/cogl-swap-chain.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-texture-2d.h b/cogl/cogl-texture-2d.h index 191b4e933..33671940f 100644 --- a/cogl/cogl-texture-2d.h +++ b/cogl/cogl-texture-2d.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-texture-3d.h b/cogl/cogl-texture-3d.h index fe9f42fb9..019be51ab 100644 --- a/cogl/cogl-texture-3d.h +++ b/cogl/cogl-texture-3d.h @@ -24,7 +24,7 @@ * Neil Roberts */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h index d2d42524a..cd65b561f 100644 --- a/cogl/cogl-texture.h +++ b/cogl/cogl-texture.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h index 120fff90b..933cac020 100644 --- a/cogl/cogl-types.h +++ b/cogl/cogl-types.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif @@ -77,7 +77,7 @@ typedef int CoglBool; definitions because we want the size to be public so they can be allocated on the stack. This macro is used to ensure that users don't accidentally access private members */ -#ifdef CLUTTER_COMPILATION +#ifdef COGL_COMPILATION #define COGL_PRIVATE(x) x #else #define COGL_PRIVATE(x) private_member_ ## x diff --git a/cogl/cogl-vector.h b/cogl/cogl-vector.h index eaeba565c..3156b1504 100644 --- a/cogl/cogl-vector.h +++ b/cogl/cogl-vector.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-vertex-buffer.h b/cogl/cogl-vertex-buffer.h index 5b95fb36a..b47188b24 100644 --- a/cogl/cogl-vertex-buffer.h +++ b/cogl/cogl-vertex-buffer.h @@ -24,7 +24,7 @@ * Robert Bragg */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-wayland-renderer.h b/cogl/cogl-wayland-renderer.h index 68fa7743e..f5a760f72 100644 --- a/cogl/cogl-wayland-renderer.h +++ b/cogl/cogl-wayland-renderer.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-win32-renderer.h b/cogl/cogl-win32-renderer.h index 3b265936e..2bf06a195 100644 --- a/cogl/cogl-win32-renderer.h +++ b/cogl/cogl-win32-renderer.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl-xlib-renderer.h b/cogl/cogl-xlib-renderer.h index a6361705f..8a8337ed0 100644 --- a/cogl/cogl-xlib-renderer.h +++ b/cogl/cogl-xlib-renderer.h @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_XLIB_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl1-context.h b/cogl/cogl1-context.h index 401b05539..49744ac4d 100644 --- a/cogl/cogl1-context.h +++ b/cogl/cogl1-context.h @@ -24,7 +24,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl2-compatibility.h b/cogl/cogl2-compatibility.h index 3c9f979ae..4707787a7 100644 --- a/cogl/cogl2-compatibility.h +++ b/cogl/cogl2-compatibility.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/cogl/cogl2-path.h b/cogl/cogl2-path.h index 88d88ebc6..196e4c38e 100644 --- a/cogl/cogl2-path.h +++ b/cogl/cogl2-path.h @@ -21,7 +21,7 @@ * */ -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION) +#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) #error "Only can be included directly." #endif diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index b305a352e..83fd55c52 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -116,7 +116,7 @@ test_conformance_CPPFLAGS = \ -DCOGL_ENABLE_EXPERIMENTAL_API \ -DCOGL_DISABLE_DEPRECATED \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ - -DCLUTTER_COMPILATION + -DCOGL_COMPILATION test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la diff --git a/tests/conform/test-no-gl-header.c b/tests/conform/test-no-gl-header.c index ab0b931cc..0628576ce 100644 --- a/tests/conform/test-no-gl-header.c +++ b/tests/conform/test-no-gl-header.c @@ -1,4 +1,4 @@ -#undef CLUTTER_COMPILATION +#undef COGL_COMPILATION #include #include "test-utils.h"