summaryrefslogtreecommitdiff
path: root/src/mesa/glapi
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-22 15:43:29 -0700
committerBrian Paul <brianp@vmware.com>2009-02-22 15:43:29 -0700
commitf2c023291a1f2887294d2aac504f8b82857ad092 (patch)
tree0853aec40ab08699d093debf08ab4553159a0cf8 /src/mesa/glapi
parentd909dbcc43c5c1d51a3946488e68a7cd1fbfe920 (diff)
mesa: move a bunch of compiler-related stuff into new compiler.h header
This trims down and cleans up imports.h and glheader.h quite a bit.
Diffstat (limited to 'src/mesa/glapi')
-rw-r--r--src/mesa/glapi/gl_enums.py3
-rw-r--r--src/mesa/glapi/glapi.c2
-rw-r--r--src/mesa/glapi/glapi_getproc.c1
-rw-r--r--src/mesa/glapi/glthread.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/glapi/gl_enums.py b/src/mesa/glapi/gl_enums.py
index 67fec7968a..b32e012663 100644
--- a/src/mesa/glapi/gl_enums.py
+++ b/src/mesa/glapi/gl_enums.py
@@ -43,6 +43,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
def printRealHeader(self):
print '#include "glheader.h"'
+ print '#include "mfeatures.h"'
print '#include "enums.h"'
print '#include "imports.h"'
print ''
@@ -55,8 +56,6 @@ class PrintGlEnums(gl_XML.gl_print_base):
def print_code(self):
print """
-#define Elements(x) sizeof(x)/sizeof(*x)
-
typedef int (*cfunc)(const void *, const void *);
/**
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c
index 9b5144a88b..e20618abc1 100644
--- a/src/mesa/glapi/glapi.c
+++ b/src/mesa/glapi/glapi.c
@@ -61,6 +61,8 @@
#endif
+#include "main/compiler.h"
+
#include <stdlib.h>
#include <string.h>
#ifdef DEBUG
diff --git a/src/mesa/glapi/glapi_getproc.c b/src/mesa/glapi/glapi_getproc.c
index 1238c4cf93..4adc1aece0 100644
--- a/src/mesa/glapi/glapi_getproc.c
+++ b/src/mesa/glapi/glapi_getproc.c
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <string.h>
#include "main/glheader.h"
+#include "main/compiler.h"
#include "glapi.h"
#include "glapioffsets.h"
#include "glapitable.h"
diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c
index 56ddf7c25a..e3abb0f4ae 100644
--- a/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@ -32,7 +32,7 @@
#include <dix-config.h>
#endif
-#include "main/glheader.h"
+#include "main/compiler.h"
#include "glthread.h"