glx: use ARRAY_SIZE from macros.h

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

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 3ea1b30d7cfbde33ad70672ee229c44b46262cde..6e50e096fa2a48a428e425c263194aa730922570 100644 (file)
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -35,6 +35,7 @@ endif
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/include/GL/internal \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/loader \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mapi/glapi \

diff --git a/src/glx/SConscript b/src/glx/SConscript
index 473c5ab6ac884f8bfa5548ce2e7df6406006c74e..b91c0bdd7585afb31c62ccc911378db991fb1d79 100644 (file)
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -11,6 +11,7 @@ env.Prepend(CPPPATH = [
        '.',           # the build/<platform>/glx/ directory
        '#include',
        '#include/GL/internal',
+       '#src/',
        '#src/loader',
        '#src/mesa',
        '#src/mapi',

diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index aaca989f1e32d39767dd21c8057c3efb662a3e71..a140c8708caaf8c4a1adf89345a757f12696258f 100644 (file)
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -56,10 +56,10 @@
 #if defined( HAVE_PTHREAD )
 # include <pthread.h>
 #endif
+#include "util/macros.h"
 
 #include "glxextensions.h"
 
-#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
 
 #define GLX_MAJOR_VERSION 1       /* current version numbers */
 #define GLX_MINOR_VERSION 4