From: Brian Paul <brianp@vmware.com>
Date: Tue, 3 Mar 2015 16:40:40 +0000 (-0700)
Subject: mapi: remove unneeded ARRAY_SIZE #define
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25a847d9cc046584aa43894f70da1bf11ba48f09;p=mesa.git

mapi: remove unneeded ARRAY_SIZE #define

include util/macros.h instead.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
---

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 90ba5715f13..ef6f5eeab92 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -46,6 +46,7 @@ AM_CPPFLAGS =							\
 	$(DEFINES)						\
 	$(SELINUX_CFLAGS)					\
 	-I$(top_srcdir)/include					\
+	-I$(top_srcdir)/src					\
 	-I$(top_srcdir)/src/mapi				\
 	-I$(top_builddir)/src/mapi
 
diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript
index 07b3eff118d..26bfe7e9529 100644
--- a/src/mapi/shared-glapi/SConscript
+++ b/src/mapi/shared-glapi/SConscript
@@ -37,6 +37,7 @@ def mapi_objects(env, printer, mode):
     cpppath = [
         header[0].dir,
         '#/include',
+        '#/src',
         '#/src/mapi',
     ]
     
diff --git a/src/mapi/stub.c b/src/mapi/stub.c
index dfadbe1a5d3..953b6c75c31 100644
--- a/src/mapi/stub.c
+++ b/src/mapi/stub.c
@@ -29,13 +29,13 @@
 #include <string.h>
 #include <assert.h>
 
+#include "util/macros.h"
 #include "u_current.h"
 #include "u_thread.h"
 #include "entry.h"
 #include "stub.h"
 #include "table.h"
 
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
 struct mapi_stub {
    const void *name;