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

cogl: remove COGL_GNUC_NULL_TERMINATED

Browse Source 
This is already defined for us in GLib, so prefer that instead.
This commit is contained in:
Niels De Graef 2018-11-23 08:48:45 +01:00
parent bf8a3b1c1c
commit 6834bedb95
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl/cogl-framebuffer.h
View File

@ -1218,7 +1218,7 @@ cogl_framebuffer_vdraw_attributes (CoglFramebuffer *framebuffer,
CoglVerticesMode mode, CoglVerticesMode mode,
int first_vertex, int first_vertex,
int n_vertices, int n_vertices,
...) COGL_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
/** /**
* cogl_framebuffer_draw_attributes: (skip) * cogl_framebuffer_draw_attributes: (skip)
@ -1332,7 +1332,7 @@ cogl_framebuffer_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
int first_vertex, int first_vertex,
int n_vertices, int n_vertices,
CoglIndices *indices, CoglIndices *indices,
...) COGL_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
/** /**
* cogl_framebuffer_draw_indexed_attributes: (skip) * cogl_framebuffer_draw_indexed_attributes: (skip)

6
cogl/cogl/cogl-types.h
View File

@ -64,12 +64,6 @@ G_BEGIN_DECLS
*/ */
typedef int CoglBool; typedef int CoglBool;
#if __GNUC__ >= 4
#define COGL_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
#else
#define COGL_GNUC_NULL_TERMINATED
#endif
/* Some structures are meant to be opaque but they have public /* Some structures are meant to be opaque but they have public
definitions because we want the size to be public so they can be 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 allocated on the stack. This macro is used to ensure that users