summaryrefslogtreecommitdiffstats
path: root/src/glx/xfont.c
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <[email protected]>2015-02-10 22:21:47 -0800
committerJeremy Huddleston Sequoia <[email protected]>2015-02-11 00:23:48 -0800
commitd03de1dd7d2261382305ea5695f9f510bc9e7dd4 (patch)
tree930df7c7622d5a2c68049b6e003b01b72a28980c /src/glx/xfont.c
parentb1b7b5b068441eccac382edab0f0872e3834be45 (diff)
darwin: build fix
xfont.c:237:14: error: implicit declaration of function 'GetGLXDRIDrawable' is invalid in C99 [-Werror,-Wimplicit-function-declaration] glxdraw = GetGLXDRIDrawable(CC->currentDpy, CC->currentDrawable); ^ Fixes regression from 291be28476ea60c6fb1eb2a882e2e25def5d3735 Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> (cherry picked from commit e68b67b53fce39a8c93188262d9e795ca50750ac)
Diffstat (limited to 'src/glx/xfont.c')
-rw-r--r--src/glx/xfont.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glx/xfont.c b/src/glx/xfont.c
index a086b7a03ef..00498bc3ea4 100644
--- a/src/glx/xfont.c
+++ b/src/glx/xfont.c
@@ -221,7 +221,10 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int lis
XGCValues values;
unsigned long valuemask;
XFontStruct *fs;
+
+#if !defined(GLX_USE_APPLEGL)
__GLXDRIdrawable *glxdraw;
+#endif
GLint swapbytes, lsbfirst, rowlength;
GLint skiprows, skippixels, alignment;
@@ -234,9 +237,11 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int first, int count, int lis
dpy = CC->currentDpy;
win = CC->currentDrawable;
+#if !defined(GLX_USE_APPLEGL)
glxdraw = GetGLXDRIDrawable(CC->currentDpy, CC->currentDrawable);
if (glxdraw)
win = glxdraw->xDrawable;
+#endif
fs = XQueryFont(dpy, font);
if (!fs) {