diff options
| author | Brian Paul <brianp@vmware.com> | 2015-03-03 09:51:19 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2015-03-04 08:33:48 -0700 |
| commit | 0339e7dbdab2ee3a4776e50461bc4697a23b57b6 (patch) | |
| tree | f3044daf14b5ac0a6c8575c3819e99c16c86093c | |
| parent | 6e836d2c8643dff127c0aef22dcabed763d7ea3e (diff) | |
glx: use ARRAY_SIZE from macros.h
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | src/glx/Makefile.am | 1 | ||||
| -rw-r--r-- | src/glx/SConscript | 1 | ||||
| -rw-r--r-- | src/glx/glxclient.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 3ea1b30d7c..6e50e096fa 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 473c5ab6ac..b91c0bdd75 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 aaca989f1e..a140c8708c 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 |