diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/cairo-xml-surface.c | 16 | ||||
| -rw-r--r-- | test/cairo-test-trace.c | 2 | ||||
| -rw-r--r-- | util/cairo-gobject/cairo-gobject-structs.c | 2 |
4 files changed, 14 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 1e14b3286..d4f759224 100644 --- a/meson.build +++ b/meson.build @@ -43,6 +43,8 @@ if cc.get_id() == 'msvc' language : 'c') endif +add_project_arguments('-D_GNU_SOURCE', language: 'c') + # Make sure source directory hasn't been configured with autotools if meson.version().version_compare('>= 0.53') fs = import('fs') diff --git a/src/cairo-xml-surface.c b/src/cairo-xml-surface.c index 43cb6dddf..401a5b3c6 100644 --- a/src/cairo-xml-surface.c +++ b/src/cairo-xml-surface.c @@ -209,13 +209,15 @@ static const char * _format_to_string (cairo_format_t format) { switch (format) { - case CAIRO_FORMAT_ARGB32: return "ARGB32"; - case CAIRO_FORMAT_RGB30: return "RGB30"; - case CAIRO_FORMAT_RGB24: return "RGB24"; - case CAIRO_FORMAT_RGB16_565: return "RGB16_565"; - case CAIRO_FORMAT_A8: return "A8"; - case CAIRO_FORMAT_A1: return "A1"; - case CAIRO_FORMAT_INVALID: return "INVALID"; + case CAIRO_FORMAT_ARGB32: return "ARGB32"; + case CAIRO_FORMAT_RGB30: return "RGB30"; + case CAIRO_FORMAT_RGB24: return "RGB24"; + case CAIRO_FORMAT_RGB16_565: return "RGB16_565"; + case CAIRO_FORMAT_RGB96F: return "RGB96F"; + case CAIRO_FORMAT_RGBA128F: return "RGBA128F"; + case CAIRO_FORMAT_A8: return "A8"; + case CAIRO_FORMAT_A1: return "A1"; + case CAIRO_FORMAT_INVALID: return "INVALID"; } ASSERT_NOT_REACHED; return "INVALID"; diff --git a/test/cairo-test-trace.c b/test/cairo-test-trace.c index 4eee5d30b..7ada3e75a 100644 --- a/test/cairo-test-trace.c +++ b/test/cairo-test-trace.c @@ -858,6 +858,8 @@ matches_reference (struct slave *slave) case CAIRO_FORMAT_RGB30: case CAIRO_FORMAT_RGB16_565: + case CAIRO_FORMAT_RGB96F: + case CAIRO_FORMAT_RGBA128F: case CAIRO_FORMAT_INVALID: assert (0); } diff --git a/util/cairo-gobject/cairo-gobject-structs.c b/util/cairo-gobject/cairo-gobject-structs.c index 95e4a44f4..9171abeb8 100644 --- a/util/cairo-gobject/cairo-gobject-structs.c +++ b/util/cairo-gobject/cairo-gobject-structs.c @@ -44,7 +44,7 @@ GType \ underscore_name ## _get_type (void) \ { \ - static volatile gsize type_volatile = 0; \ + static gsize type_volatile = 0; \ if (g_once_init_enter (&type_volatile)) { \ GType type = g_boxed_type_register_static (g_intern_static_string (Name), \ (GBoxedCopyFunc)copy_func, \ |