brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Guard cogl-object.h within COGL_BEGIN_DECLS

Browse Source 
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
This commit is contained in:
Tomeu Vizoso 2013-02-22 16:27:58 +01:00
parent 6cab431f4c
commit 74a749386b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl/cogl-object.h
View File

@ -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 */