Mesa (master): glx: use ARRAY_SIZE from macros.h

[Brian Paul]

Module: Mesa
Branch: master
Commit: 0339e7dbdab2ee3a4776e50461bc4697a23b57b6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0339e7dbdab2ee3a4776e50461bc4697a23b57b6

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Mar  3 09:51:19 2015 -0700

glx: use ARRAY_SIZE from macros.h

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

---

 src/glx/Makefile.am |    1 +
 src/glx/SConscript  |    1 +
 src/glx/glxclient.h |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 3ea1b30..6e50e09 100644
--- 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 473c5ab..b91c0bd 100644
--- 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 aaca989..a140c87 100644
--- 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