summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11/xfonts.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2001-01-08 04:06:20 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2001-01-08 04:06:20 +0000
commite9bf776711b22ce336cd462adf534ad3e2d61eec (patch)
tree6ab4e1d24947ffca108d1ada9710bb9563e93011 /src/mesa/drivers/x11/xfonts.c
parent78477947de9c8a69bd4beec2ef24abd0d142d080 (diff)
Modify X11 driver and fake glx to store a GLcontext
(ie a 'struct __GLcontextRec *') instead of an 'XMesaContext'. This is to fix conflicts in XFree86 where both the indirect XMesaContext and the GLcontext were calling themselves __GLcontextRec's.
Diffstat (limited to 'src/mesa/drivers/x11/xfonts.c')
-rw-r--r--src/mesa/drivers/x11/xfonts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 4243f3ff8d..6e73504ba5 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,8 +1,8 @@
-/* $Id: xfonts.c,v 1.10 2000/11/10 17:23:03 brianp Exp $ */
+/* $Id: xfonts.c,v 1.11 2001/01/08 04:06:20 keithw Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.4
+ * Version: 3.5
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*