[cogl/cogl-1.14] Guard cogl-object.h within COGL_BEGIN_DECLS

[Tomeu Vizoso <tomeuv src gnome org>]

commit 74a749386bdfa45cea49cb4460d3185c2275bc22
Author: Tomeu Vizoso <tomeu vizoso collabora com>
Date:   Fri Feb 22 16:27:58 2013 +0100

    Guard cogl-object.h within COGL_BEGIN_DECLS
    
    To avoid linking trouble in C++ stuff
    
    Reviewed-By: Neil Roberts <neil linux intel com>
    
    (cherry picked from commit b194f1bf58055ef1f5075508f19336cae648a0c8)
    
    Conflicts:
        cogl/cogl-object.h

 cogl/cogl-object.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/cogl/cogl-object.h b/cogl/cogl-object.h
index eb7a825..dd7ffa0 100644
--- a/cogl/cogl-object.h
+++ b/cogl/cogl-object.h
@@ -25,6 +25,10 @@
 #ifndef __COGL_OBJECT_H
 #define __COGL_OBJECT_H
 
+#include <cogl/cogl-types.h>
+
+COGL_BEGIN_DECLS
+
 typedef struct _CoglObject      CoglObject;
 
 #define COGL_OBJECT(X)          ((CoglObject *)X)
@@ -209,5 +213,7 @@ cogl_debug_object_print_instances (void);
 
 #endif /* COGL_ENABLE_EXPERIMENTAL_API */
 
+COGL_END_DECLS
+
 #endif /* __COGL_OBJECT_H */