From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 11 Feb 2015 06:21:47 +0000 (-0800)
Subject: darwin: build fix
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e68b67b53fce39a8c93188262d9e795ca50750ac;p=mesa.git

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 <jeremyhu@apple.com>
---

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) {