From 1c91bd4a05a6630e78cc84f4e34b6a632cf23753 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 12 Jun 2013 16:23:30 +0100 Subject: [PATCH] renderer: assert CoglPrivateFeatureFlags fit in 32 bits This updates the static assertion in cogl-renderer.c to only check that the flags will fit in 32 bits instead of asserting the type has the same size as an unsigned long. (cherry picked from commit c6893fa3c9eda0f13b79d3a1fc03f8b79c42a8f6) --- cogl/cogl-renderer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c index fc207a8d2..ada3c3baf 100644 --- a/cogl/cogl-renderer.c +++ b/cogl/cogl-renderer.c @@ -101,9 +101,9 @@ typedef struct _CoglDriverDescription const char *libgl_name; } CoglDriverDescription; -_COGL_STATIC_ASSERT(sizeof (CoglPrivateFeatureFlags) == - sizeof (unsigned long), - "Private feature flags don't fit in long"); +_COGL_STATIC_ASSERT(sizeof (CoglPrivateFeatureFlags) <= + sizeof (uint32_t), + "Private feature flags don't fit in 32 bits"); static CoglDriverDescription _cogl_drivers[] = {