summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/dlist.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/dlist.c
parenta7313e045dfd1ab439e8e01664d402ea9ce0a37e (diff)
Fixed includes & added a few hooks for the DRI.kw-mesa-1
Diffstat (limited to 'src/mesa/main/dlist.c')
-rw-r--r--src/mesa/main/dlist.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 60547dc5918..b1a4ed05e0a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.5 1999/09/20 14:30:22 keithw Exp $ */
+/* $Id: dlist.c,v 1.6 1999/10/08 09:27:10 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -25,13 +25,19 @@
*/
+/* $XFree86: xc/lib/GL/mesa/src/dlist.c,v 1.3 1999/04/04 00:20:22 dawes Exp $ */
+
#ifdef PC_HEADER
#include "all.h"
#else
+#ifndef XFree86Server
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#else
+#include "GL/xf86glx.h"
+#endif
#include "accum.h"
#include "api.h"
#include "alpha.h"
@@ -52,6 +58,7 @@
#include "feedback.h"
#include "fog.h"
#include "get.h"
+#include "glmisc.h"
#include "hash.h"
#include "image.h"
#include "light.h"
@@ -61,7 +68,6 @@
#include "macros.h"
#include "masking.h"
#include "matrix.h"
-#include "misc.h"
#include "pipeline.h"
#include "pixel.h"
#include "points.h"