summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-05-01 22:00:47 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-05-01 22:00:47 +0000
commit72d4c40401bd3874e36e9f068d168abdf7cfbd8e (patch)
tree7a484176004be430ca6c507f6e513c50740e0d99
parent032908842abb81ab0ba9c44656e9e5d919ad710f (diff)
minor changes from XFree86
-rw-r--r--src/mesa/drivers/x11/xmesaP.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 55e86f6f2f..b645d0ef9e 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -1,4 +1,4 @@
-/* $Id: xmesaP.h,v 1.11 2000/07/19 23:26:35 brianp Exp $ */
+/* $Id: xmesaP.h,v 1.11.2.1 2001/05/01 22:00:47 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -227,7 +227,11 @@ struct xmesa_buffer {
/* Used to do XAllocColor/XFreeColors accounting: */
int num_alloced;
+#if defined(XFree86Server)
+ Pixel alloced_colors[256];
+#else
unsigned long alloced_colors[256];
+#endif
#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server)
__DRIdrawablePrivate *driDrawPriv; /* back pointer to DRI drawable