From 0331153b227c1cadf94f912cc02949d7159b02a2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 24 Jun 2019 21:49:59 +0200 Subject: [PATCH] modesetting: Fix compiler warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following compiler warning: drmmode_display.c: In function ‘drmmode_create_bo’: drmmode_display.c:1019:9: warning: ISO C90 forbids mixed declarations and code [ 1019 | uint32_t num_modifiers; | ^~~~~~~~ Reviewed-by: Michel Dänzer Signed-off-by: Hans de Goede --- hw/xfree86/drivers/modesetting/drmmode_display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index cb48aa46b..930072f94 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1008,6 +1008,10 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, #ifdef GLAMOR_HAS_GBM if (drmmode->glamor) { +#ifdef GBM_BO_WITH_MODIFIERS + uint32_t num_modifiers; + uint64_t *modifiers = NULL; +#endif uint32_t format; if (drmmode->scrn->depth == 30) @@ -1016,9 +1020,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, format = GBM_FORMAT_ARGB8888; #ifdef GBM_BO_WITH_MODIFIERS - uint32_t num_modifiers; - uint64_t *modifiers = NULL; - num_modifiers = get_modifiers_set(drmmode->scrn, format, &modifiers, FALSE, TRUE); if (num_modifiers > 0 &&