summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/set.c
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2013-02-06 09:50:22 -0800
committerPaul Berry <[email protected]>2013-02-08 06:51:22 -0800
commita4b9678a5451465b7df8a7fd8acc1fa9c5300181 (patch)
tree078f79863aba0302e75868a29dca29fbf71a808f /src/mesa/main/set.c
parentdc92b2d11fb939cf2a0ef330559d49304086c10a (diff)
Consolidate some redundant definitions of ARRAY_SIZE() macro.
Previous to this patch, there were 13 identical definitions of this macro in Mesa source. That's ridiculous. This patch consolidates 6 of them to a single definition in src/mesa/main/macros.h. Unfortunately, I wasn't able to eliminate the remaining definitions, since they occur in places that don't include src/mesa/main/macros.h: - include/pci_ids/pci_id_driver_map.h - src/egl/drivers/dri2/egl_dri2.h - src/egl/main/egldefines.h - src/gbm/main/backend.c - src/gbm/main/gbm.c - src/glx/glxclient.h - src/mapi/mapi/stub.c I'm open to suggestions as to how to deal with the remaining redundancy. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/set.c')
-rw-r--r--src/mesa/main/set.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/main/set.c b/src/mesa/main/set.c
index 736841fc9c0..2519b96947a 100644
--- a/src/mesa/main/set.c
+++ b/src/mesa/main/set.c
@@ -34,11 +34,10 @@
#include <stdlib.h>
+#include "macros.h"
#include "set.h"
#include "ralloc.h"
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
-
/*
* From Knuth -- a good choice for hash/rehash values is p, p-2 where
* p and p-2 are both prime. These tables are sized to have an extra 10%