summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/context.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>1999-10-08 09:27:09 +0000
committerKeith Whitwell <[email protected]>1999-10-08 09:27:09 +0000
commit485f04074151686fa24d40e3eeb83029d3d8c425 (patch)
treed74a44fb266d6534fbbc060be7658f9deefea538 /src/mesa/main/context.c
parenta7313e045dfd1ab439e8e01664d402ea9ce0a37e (diff)
Fixed includes & added a few hooks for the DRI.kw-mesa-1
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r--src/mesa/main/context.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index d7f751dba5f..47cba24ee5f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.9 1999/09/19 23:43:02 keithw Exp $ */
+/* $Id: context.c,v 1.10 1999/10/08 09:27:10 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -25,6 +25,8 @@
*/
+/* $XFree86: xc/lib/GL/mesa/src/context.c,v 1.4 1999/04/04 00:20:21 dawes Exp $ */
+
/*
* If multi-threading is enabled (-DTHREADS) then each thread has it's
* own rendering context. A thread obtains the pointer to its GLcontext
@@ -38,11 +40,15 @@
#ifdef PC_HEADER
#include "all.h"
#else
+#ifndef XFree86Server
#include <assert.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#else
+#include "GL/xf86glx.h"
+#endif
#include "accum.h"
#include "alphabuf.h"
#include "api.h"