[cogl/wip/cogl-1.12] Mass rename CLUTTER_COMPILATION to COGL_COMPILATION

From: Tomeu Vizoso <tomeuv src gnome org>
To: commits-list gnome org
Cc:
Subject: [cogl/wip/cogl-1.12] Mass rename CLUTTER_COMPILATION to COGL_COMPILATION
Date: Wed, 20 Jun 2012 17:54:23 +0000 (UTC)
commit 7123c9d94538a616ca4b59aa9aca0f16b8dbc566
Author: Tomeu Vizoso <tomeu vizoso collabora com>
Date:   Wed Jun 20 19:44:41 2012 +0200

    Mass rename CLUTTER_COMPILATION to COGL_COMPILATION

 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        |    2 +-
 cogl/cogl-defines.h.win32_SDL    |    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            |    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-renderer.h         |    2 +-
 cogl/cogl-material-compat.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.h            |    2 +-
 cogl/cogl-quaternion.h           |    2 +-
 cogl/cogl-renderer.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 +-
 58 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 9497f27..0e06c48 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -5,12 +5,12 @@
 	<GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
     <CoglApiVersion>1.0</CoglApiVersion>
     <BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
-    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
+    <LibBuildDefines>HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
     <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
     <DebugLibBuildDefines>_DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG</DebugLibBuildDefines>
     <CoglBuildDefines>G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir"</CoglBuildDefines>
     <CoglPangoBuildDefines>G_LOG_DOMAIN="Cogl-Pango"</CoglPangoBuildDefines>
-    <TestProgDef>CLUTTER_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
+    <TestProgDef>COGL_COMPILATION;TESTS_DATADIR="../share/cogl-$(CoglApiVersion)/tests"</TestProgDef>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DoDefinesSDL>
 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 ef4de04..439fbff 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -36,7 +36,7 @@
 	/>
 	<UserMacro
 		Name="LibBuildDefines"
-		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;$(BaseBuildDefines)"
+		Value="HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)"
 	/>
 	<UserMacro
 		Name="ReleaseLibBuildDefines"
@@ -56,7 +56,7 @@
 	/>
 	<UserMacro
 		Name="TestProgDef"
-		Value="CLUTTER_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;"
+		Value="COGL_COMPILATION;TESTS_DATADIR=\&quot;../share/cogl-$(CoglApiVersion)/tests\&quot;"
 	/>
 	<UserMacro
 		Name="DoDefinesSDL"
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
index b49562f..8a59a2c 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -37,7 +37,7 @@ libcogl_pango_la_LDFLAGS = \
 	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
 
 INCLUDES = \
-	-DCLUTTER_COMPILATION		\
+	-DCOGL_COMPILATION		\
 	-DG_LOG_DOMAIN=\"CoglPango\"	\
 	-I$(top_srcdir)/cogl		\
 	-I$(top_builddir)/cogl		\
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 0027be5..59c622a 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES = \
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Cogl\" 	\
-	-DCLUTTER_COMPILATION		\
+	-DCOGL_COMPILATION		\
 	-DCOGL_GL_LIBNAME=\"$(COGL_GL_LIBNAME)\" \
 	-DCOGL_GLES1_LIBNAME=\"$(COGL_GLES1_LIBNAME)\" \
 	-DCOGL_GLES2_LIBNAME=\"$(COGL_GLES2_LIBNAME)\" \
diff --git a/cogl/cogl-attribute-buffer.h b/cogl/cogl-attribute-buffer.h
index 492ba21..04ee2ba 100644
--- a/cogl/cogl-attribute-buffer.h
+++ b/cogl/cogl-attribute-buffer.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-attribute.h b/cogl/cogl-attribute.h
index b59402c..74a0dde 100644
--- a/cogl/cogl-attribute.h
+++ b/cogl/cogl-attribute.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-bitmap.h b/cogl/cogl-bitmap.h
index e2e2962..fdf2f53 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-buffer.h b/cogl/cogl-buffer.h
index ffd8968..d1f11e8 100644
--- a/cogl/cogl-buffer.h
+++ b/cogl/cogl-buffer.h
@@ -25,7 +25,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-clip-state.h b/cogl/cogl-clip-state.h
index b51943f..70cb63b 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-clutter-xlib.h b/cogl/cogl-clutter-xlib.h
index 766ceba..6c08f58 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 <cogl/cogl-xlib.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-clutter.h b/cogl/cogl-clutter.h
index 3125db8..2b068a9 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-color.h b/cogl/cogl-color.h
index 7ca7cb6..c70673e 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h
index 51a435f..a12e950 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-defines.h.in b/cogl/cogl-defines.h.in
index 3d4b17d..12253ab 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-defines.h.win32 b/cogl/cogl-defines.h.win32
index 75a70ba..ded1474 100644
--- a/cogl/cogl-defines.h.win32
+++ b/cogl/cogl-defines.h.win32
@@ -21,7 +21,7 @@
  *
  */
  
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-defines.h.win32_SDL b/cogl/cogl-defines.h.win32_SDL
index 5141857..d9d77dd 100644
--- a/cogl/cogl-defines.h.win32_SDL
+++ b/cogl/cogl-defines.h.win32_SDL
@@ -21,7 +21,7 @@
  *
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-depth-state.h b/cogl/cogl-depth-state.h
index 0fff9a0..49bf67d 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h
index d4d4735..5984aa1 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-euler.h b/cogl/cogl-euler.h
index e82eab1..9442846 100644
--- a/cogl/cogl-euler.h
+++ b/cogl/cogl-euler.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-fixed.h b/cogl/cogl-fixed.h
index 5d7e567..009ad7b 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-gl-header.h b/cogl/cogl-gl-header.h
index a3f44b1..c47d901 100644
--- a/cogl/cogl-gl-header.h
+++ b/cogl/cogl-gl-header.h
@@ -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 a6334b6..87cc523 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 <cogl/cogl-gles2-types.h>
diff --git a/cogl/cogl-glib-source.h b/cogl/cogl-glib-source.h
index 6bd5dd4..1ce7d7e 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-index-buffer.h b/cogl/cogl-index-buffer.h
index 2e64ab3..5c2358f 100644
--- a/cogl/cogl-index-buffer.h
+++ b/cogl/cogl-index-buffer.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-indices.h b/cogl/cogl-indices.h
index 23cc911..1133ddb 100644
--- a/cogl/cogl-indices.h
+++ b/cogl/cogl-indices.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-kms-renderer.h b/cogl/cogl-kms-renderer.h
index 68d126e..539fa78 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-material-compat.h b/cogl/cogl-material-compat.h
index f07bb69..8ae3c61 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-meta-texture.h b/cogl/cogl-meta-texture.h
index dca9f5e..b896cd0 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-offscreen.h b/cogl/cogl-offscreen.h
index 47298bd..b8b16ff 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-onscreen-template.h b/cogl/cogl-onscreen-template.h
index 64d9b74..cd531d3 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index 9d150b2..53ae8a0 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -25,7 +25,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-path-functions.h b/cogl/cogl-path-functions.h
index 2566fe1..c5413fb 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-path.h b/cogl/cogl-path.h
index c3d0d45..b29fdee 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pipeline-layer-state.h b/cogl/cogl-pipeline-layer-state.h
index bfe0483..a2cae84 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pipeline-state.h b/cogl/cogl-pipeline-state.h
index 8686629..0795c78 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pipeline.h b/cogl/cogl-pipeline.h
index d990e24..cacf446 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-pixel-buffer.h b/cogl/cogl-pixel-buffer.h
index 49bd603..1cd0346 100644
--- a/cogl/cogl-pixel-buffer.h
+++ b/cogl/cogl-pixel-buffer.h
@@ -25,7 +25,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-poll.h b/cogl/cogl-poll.h
index 9c520b6..306fdb3 100644
--- a/cogl/cogl-poll.h
+++ b/cogl/cogl-poll.h
@@ -24,7 +24,7 @@
  *  Neil Roberts <neil linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-primitive.h b/cogl/cogl-primitive.h
index 134bb87..13be5f8 100644
--- a/cogl/cogl-primitive.h
+++ b/cogl/cogl-primitive.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-quaternion.h b/cogl/cogl-quaternion.h
index eb60bcd..2d956f9 100644
--- a/cogl/cogl-quaternion.h
+++ b/cogl/cogl-quaternion.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h
index 6ad95fb..74c7cd9 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-shader.h b/cogl/cogl-shader.h
index c9aad74..9ec80c6 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-snippet.h b/cogl/cogl-snippet.h
index 88a49d2..6fcd94f 100644
--- a/cogl/cogl-snippet.h
+++ b/cogl/cogl-snippet.h
@@ -25,7 +25,7 @@
  *   Neil Roberts <neil linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-sub-texture.h b/cogl/cogl-sub-texture.h
index 6dae9ae..8367b7e 100644
--- a/cogl/cogl-sub-texture.h
+++ b/cogl/cogl-sub-texture.h
@@ -24,7 +24,7 @@
  *   Neil Roberts <neil linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-swap-chain.h b/cogl/cogl-swap-chain.h
index 0420935..aaffaf8 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-texture-2d.h b/cogl/cogl-texture-2d.h
index f191924..9835225 100644
--- a/cogl/cogl-texture-2d.h
+++ b/cogl/cogl-texture-2d.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-texture-3d.h b/cogl/cogl-texture-3d.h
index 6c14912..17fbd1d 100644
--- a/cogl/cogl-texture-3d.h
+++ b/cogl/cogl-texture-3d.h
@@ -24,7 +24,7 @@
  *   Neil Roberts <neil linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-texture.h b/cogl/cogl-texture.h
index 4eeffb5..9c96d79 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h
index 28e3f1e..ece5c33 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 <cogl/cogl.h> can be included directly."
 #endif
 
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
    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 c6824d6..78bcbe0 100644
--- a/cogl/cogl-vector.h
+++ b/cogl/cogl-vector.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-vertex-buffer.h b/cogl/cogl-vertex-buffer.h
index 631ba09..8fc358f 100644
--- a/cogl/cogl-vertex-buffer.h
+++ b/cogl/cogl-vertex-buffer.h
@@ -24,7 +24,7 @@
  *   Robert Bragg <robert linux intel com>
  */
 
-#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-wayland-renderer.h b/cogl/cogl-wayland-renderer.h
index 68fa774..f5a760f 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-win32-renderer.h b/cogl/cogl-win32-renderer.h
index 3b26593..2bf06a1 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl-xlib-renderer.h b/cogl/cogl-xlib-renderer.h
index c22d2e5..7a03106 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 <cogl/cogl-xlib.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl1-context.h b/cogl/cogl1-context.h
index c59bd69..9acd66a 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl2-compatibility.h b/cogl/cogl2-compatibility.h
index 3c9f979..4707787 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/cogl/cogl2-path.h b/cogl/cogl2-path.h
index f702c4a..fe57eaf 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 <cogl/cogl.h> can be included directly."
 #endif
 
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 306917f..5898db2 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -112,7 +112,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
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]