diff options
| author | Keith Whitwell <[email protected]> | 2008-09-18 18:57:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-18 19:03:02 +0100 |
| commit | 89ab66448e1bcd78caab6678261c2885dcff741c (patch) | |
| tree | be36d7e3eba3f64e54da34ff7ba64b3eb14e56aa /src/mesa/glapi/glthread.c | |
| parent | 1074e8e4e47bb4af73c7ef730d0fec40e826cc7e (diff) | |
| parent | 5e530d8384b0d9bb867d6407315587c84a443902 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
Diffstat (limited to 'src/mesa/glapi/glthread.c')
| -rw-r--r-- | src/mesa/glapi/glthread.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c index 09cc8cfcde2..56ddf7c25ac 100644 --- a/src/mesa/glapi/glthread.c +++ b/src/mesa/glapi/glthread.c @@ -28,6 +28,9 @@ * truly reusable outside of Mesa. First, the glheader.h include must go. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif #include "main/glheader.h" #include "glthread.h" |