Merge remote branch 'origin/gallium-0.2' into gallium-0.2

[mesa.git] / src / glx / x11 / xfont.c

diff --git a/src/glx/x11/xfont.c b/src/glx/x11/xfont.c
index f3e3da3e790d2af0368108b1f3c126ca18badded..6ec8c2d6bf60a0e28d46442b0ab1814d541c6611 100644 (file)
--- 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