projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_7_branch'
[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..16e5ce642f303a7a8dace198dfe85266002fc589 100644
(file)
--- a/
src/gallium/state_trackers/glx/xlib/glx_usefont.c
+++ b/
src/gallium/state_trackers/glx/xlib/glx_usefont.c
@@
-33,6
+33,7
@@
#include "main/context.h"
#include "main/imports.h"
#include <GL/glx.h>
+#include "pipe/p_compiler.h"
/* Some debugging info. */
@@
-210,7
+211,7
@@
isvalid(XFontStruct * fs, unsigned int which)
}
-void
+
PUBLIC
void
glXUseXFont(Font font, int first, int count, int listbase)
{
Display *dpy;