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 90ba5715f13518f073bd1f9ce97eacec3c9658af..ef6f5eeab9217fd6fc3c9418797ded9be50dbae2 100644 (file)
--- 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 07b3eff118d716f31b79a7b7730d2b63d52ee0dc..26bfe7e95290c39f1f7c7ac769a7c33f395c9fad 100644 (file)
--- 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 dfadbe1a5d312da1476c5bd74a7f9bb915299fab..953b6c75c3198536d3dcb0a8f9a81a862241860e 100644 (file)
--- 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;