From 864340219ba5aa90a19eb1336459d78a9b02cd16 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 25 Feb 2015 08:35:32 -0500 Subject: [PATCH] freedreno: drop ARRAY_SIZE macro Since now ARRAY_SIZE has been added to util/macros.h. Fixes a bunch of: freedreno_util.h:79:0: warning: "ARRAY_SIZE" redefined #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) ^ In file included from ../../../../src/gallium/include/pipe/p_compiler.h:36:0, from ../../../../src/gallium/include/pipe/p_context.h:31, from freedreno_context.h:32, from freedreno_context.c:29: ../../../../src/util/macros.h:29:0: note: this is the location of the previous definition # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) ^ Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/freedreno_util.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h index ec1db94f649..929715c2911 100644 --- a/src/gallium/drivers/freedreno/freedreno_util.h +++ b/src/gallium/drivers/freedreno/freedreno_util.h @@ -76,8 +76,6 @@ extern bool fd_binning_enabled; debug_printf("%s:%d: "fmt "\n", \ __FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0) -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - /* for conditionally setting boolean flag(s): */ #define COND(bool, val) ((bool) ? (val) : 0) -- 2.30.2