summaryrefslogtreecommitdiff
path: root/src/glx/x11/xfont.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-06-12 00:11:54 +0100
committerAlan Hourihane <alanh@tungstengraphics.com>2008-06-12 00:11:54 +0100
commit6f7ed99b306990f284f9d57c0b66efaa7f2277e1 (patch)
tree23819c5863553573f6cf70de8e5ee127a875b63b /src/glx/x11/xfont.c
parent2161b0fafcdc16703162dd489d2ec1e7114cce4c (diff)
revert the DRI2 commits
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 6ec8c2d6bf..f3e3da3e79 100644
--- a/src/glx/x11/xfont.c
+++ b/src/glx/x11/xfont.c
@@ -33,7 +33,6 @@
called by that routine when direct rendering is enabled.
*/
-#ifdef GLX_DIRECT_RENDERING
#include "glxclient.h"
@@ -209,7 +208,8 @@ static XCharStruct *isvalid(XFontStruct *fs, int which)
return(NULL);
}
-_X_HIDDEN void DRI_glXUseXFont( Font font, int first, int count, int listbase )
+
+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);
}
-#endif
+/* The End. */