st/xa: Initial import of the xa state-tracker and the xa-vmwgfx target.

[mesa.git] / src / gallium / state_trackers / glx / xlib / glx_usefont.c

diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
index acc64df62b671a25dc519bad1900c8cf7119b374..0aa37e150b8c6f24341be53ec6d49b6a6e24fe74 100644 (file)
--- a/src/gallium/state_trackers/glx/xlib/glx_usefont.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
@@ -30,8 +30,7 @@
  */
 
 
-#include "main/context.h"
-#include "main/imports.h"
+#include "main/core.h"
 #include <GL/glx.h>
 
 
@@ -210,7 +209,7 @@ isvalid(XFontStruct * fs, unsigned int which)
 }
 
 
-void
+PUBLIC void
 glXUseXFont(Font font, int first, int count, int listbase)
 {
    Display *dpy;
@@ -343,7 +342,7 @@ glXUseXFont(Font font, int first, int count, int listbase)
       glNewList(list, GL_COMPILE);
       if (valid && (bm_width > 0) && (bm_height > 0)) {
 
-        MEMSET(bm, '\0', bm_width * bm_height);
+        memset(bm, '\0', bm_width * bm_height);
         fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, bm);
 
         glBitmap(width, height, x0, y0, dx, dy, bm);