From 98516061c328fd4306b2059cd6bc7d443d4900a3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 15 Sep 2010 11:56:59 +0100 Subject: [PATCH] Enumeration value should be on the same line The glib-mkenums script is not clever enough to deal with FLAGS_VALUE = FLAGS_A | FLAGS_B And since this breaks the enumeration GType and the introspection data, we cannot really wait for it to be fixed. See: https://bugzilla.gnome.org/show_bug.cgi?id=629741 http://bugzilla.clutter-project.org/show_bug.cgi?id=2238 --- clutter/cogl/cogl/cogl-buffer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clutter/cogl/cogl/cogl-buffer.h b/clutter/cogl/cogl/cogl-buffer.h index 8ad45a233..f7b954930 100644 --- a/clutter/cogl/cogl/cogl-buffer.h +++ b/clutter/cogl/cogl/cogl-buffer.h @@ -154,8 +154,7 @@ cogl_buffer_get_update_hint (CoglBuffer *buffer); typedef enum { /*< prefix=COGL_BUFFER_ACCESS >*/ COGL_BUFFER_ACCESS_READ = 1 << 0, COGL_BUFFER_ACCESS_WRITE = 1 << 1, - COGL_BUFFER_ACCESS_READ_WRITE = COGL_BUFFER_ACCESS_READ | - COGL_BUFFER_ACCESS_WRITE + COGL_BUFFER_ACCESS_READ_WRITE = COGL_BUFFER_ACCESS_READ | COGL_BUFFER_ACCESS_WRITE } CoglBufferAccess;