summaryrefslogtreecommitdiff
path: root/src/glx/x11/xfont.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-06-10 20:17:16 +0100
committerAlan Hourihane <alanh@tungstengraphics.com>2008-06-11 14:10:08 +0100
commit4566b006f1a6bbdb96871e511e10e16f18bad23e (patch)
tree6938da5e79dec0f33ca93ac0bef68d6d56f71f00 /src/glx/x11/xfont.c
parentbd9264210097d08073a4ea3619ca25db56245280 (diff)
Bring in DRI2 changes
Diffstat (limited to 'src/glx/x11/xfont.c')
-rw-r--r--src/glx/x11/xfont.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glx/x11/xfont.c b/src/glx/x11/xfont.c
index f3e3da3e79..6ec8c2d6bf 100644
--- a/src/glx/x11/xfont.c
+++ b/src/glx/x11/xfont.c
@@ -33,6 +33,7 @@
called by that routine when direct rendering is enabled.
*/
+#ifdef GLX_DIRECT_RENDERING
#include "glxclient.h"
@@ -208,8 +209,7 @@ static XCharStruct *isvalid(XFontStruct *fs, int which)
return(NULL);
}
-
-void DRI_glXUseXFont( Font font, int first, int count, int listbase )
+_X_HIDDEN void DRI_glXUseXFont( Font font, int first, int count, int listbase )
{
GLXContext CC;
Display *dpy;
@@ -373,4 +373,4 @@ bm_height);
glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
}
-/* The End. */
+#endif