[cogl] Fix the prototypes for cogl_gtype_ functions

[Robert Bragg <rbragg src gnome org>]

commit 99ff58e20dc1a30f68b3cfb0eef012dd1b2bf4f2
Author: Robert Bragg <robert linux intel com>
Date:   Thu Apr 19 11:24:04 2012 +0100

    Fix the prototypes for cogl_gtype_ functions
    
    cogl-matrix.h was still checking for the removed
    _COGL_SUPPORTS_GTYPE_INTEGRATION define instead of
    COGL_HAS_GTYPE_SUPPORT and although Makefile.am.enums was recently
    updated so that the output _get_type() symbols would have a cogl_gtype_
    namespace the corresponding change to ensure the header prototypes would
    have the same namespace wasn't made.
    
    This patch fixes both of those oversights.
    
    Reviewed-by: Neil Roberts <neil linux intel com>

 build/autotools/Makefile.am.enums |    1 +
 cogl/cogl-matrix.h                |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/build/autotools/Makefile.am.enums b/build/autotools/Makefile.am.enums
index 1c92437..a5f7d12 100644
--- a/build/autotools/Makefile.am.enums
+++ b/build/autotools/Makefile.am.enums
@@ -34,6 +34,7 @@ EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 
 stamp-enum-types: $(glib_enum_headers) $(enum_tmpl_h)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
+	  	--symbol-prefix cogl_gtype \
 		--template $(enum_tmpl_h) \
 	$(glib_enum_headers) > xgen-eh \
 	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h
index b5b5fc3..1aae814 100644
--- a/cogl/cogl-matrix.h
+++ b/cogl/cogl-matrix.h
@@ -699,7 +699,7 @@ cogl_matrix_is_identity (const CoglMatrix *matrix);
 void
 cogl_matrix_transpose (CoglMatrix *matrix);
 
-#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION
+#ifdef COGL_HAS_GTYPE_SUPPORT
 
 #define COGL_GTYPE_TYPE_MATRIX (cogl_gtype_matrix_get_type ())
 
@@ -713,7 +713,7 @@ cogl_matrix_transpose (CoglMatrix *matrix);
 GType
 cogl_gtype_matrix_get_type (void);
 
-#endif /* _COGL_SUPPORTS_GTYPE_INTEGRATION */
+#endif /* COGL_HAS_GTYPE_SUPPORT */
 
 G_END_DECLS