cogl: Let the g-ir-scanner see the type structs typedefs

By only showing the g-ir-scanner void typedefs it will make it print
warnings. Lets please it by showing the actual typedef.

https://bugzilla.gnome.org/show_bug.cgi?id=768977
This commit is contained in:
Jonas Ådahl 2016-06-16 16:32:04 -04:00
parent 75c3cf0589
commit cd0f8e5cd1
6 changed files with 11 additions and 6 deletions

View File

@ -66,7 +66,8 @@ COGL_BEGIN_DECLS
* without blocking other Cogl operations. * without blocking other Cogl operations.
*/ */
#ifdef __COGL_H_INSIDE__ #if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) && \
!defined(COGL_GIR_SCANNING)
/* For the public C api we typedef interface types as void to avoid needing /* For the public C api we typedef interface types as void to avoid needing
* lots of casting in code and instead we will rely on runtime type checking * lots of casting in code and instead we will rely on runtime type checking
* for these objects. */ * for these objects. */

View File

@ -37,7 +37,8 @@
/* We forward declare the CoglFramebuffer type here to avoid some circular /* We forward declare the CoglFramebuffer type here to avoid some circular
* dependency issues with the following headers. * dependency issues with the following headers.
*/ */
#if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) #if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) && \
!defined(COGL_GIR_SCANNING)
/* For the public C api we typedef interface types as void to avoid needing /* For the public C api we typedef interface types as void to avoid needing
* lots of casting in code and instead we will rely on runtime type checking * lots of casting in code and instead we will rely on runtime type checking
* for these objects. */ * for these objects. */

View File

@ -92,7 +92,8 @@ COGL_BEGIN_DECLS
* meta-textures.</note> * meta-textures.</note>
*/ */
#if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) #if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) && \
!defined(COGL_GIR_SCANNING)
/* For the public C api we typedef interface types as void to avoid needing /* For the public C api we typedef interface types as void to avoid needing
* lots of casting in code and instead we will rely on runtime type checking * lots of casting in code and instead we will rely on runtime type checking
* for these objects. */ * for these objects. */

View File

@ -63,7 +63,8 @@ COGL_BEGIN_DECLS
* primitive textures.</note> * primitive textures.</note>
*/ */
#ifdef __COGL_H_INSIDE__ #if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) && \
!defined(COGL_GIR_SCANNING)
/* For the public C api we typedef interface types as void to avoid needing /* For the public C api we typedef interface types as void to avoid needing
* lots of casting in code and instead we will rely on runtime type checking * lots of casting in code and instead we will rely on runtime type checking
* for these objects. */ * for these objects. */

View File

@ -38,7 +38,8 @@
/* We forward declare the CoglTexture type here to avoid some circular /* We forward declare the CoglTexture type here to avoid some circular
* dependency issues with the following headers. * dependency issues with the following headers.
*/ */
#if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) #if defined(__COGL_H_INSIDE__) && !defined(COGL_ENABLE_MUTTER_API) && \
!defined(COGL_GIR_SCANNING)
/* For the public C api we typedef interface types as void to avoid needing /* For the public C api we typedef interface types as void to avoid needing
* lots of casting in code and instead we will rely on runtime type checking * lots of casting in code and instead we will rely on runtime type checking
* for these objects. */ * for these objects. */

View File

@ -44,7 +44,7 @@
* so these macros are only kept for compatibility... * so these macros are only kept for compatibility...
*/ */
#ifndef COGL_ENABLE_MUTTER_API #if !defined(COGL_ENABLE_MUTTER_API) && !defined(COGL_GIR_SCANNING)
#define COGL_FRAMEBUFFER(X) (X) #define COGL_FRAMEBUFFER(X) (X)
#define COGL_BUFFER(X) (X) #define COGL_BUFFER(X) (X)
#define COGL_TEXTURE(X) (X) #define COGL_TEXTURE(X) (X)