diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2015-02-10 22:21:47 -0800 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2015-02-10 22:22:33 -0800 |
| commit | e68b67b53fce39a8c93188262d9e795ca50750ac (patch) | |
| tree | 4d35e97fb38787e380dcf7d20cc51456777ce268 /src/glx | |
| parent | 1c67a5687a35e984323b6034adb914a66d64bb2f (diff) | |
| download | external_mesa3d-e68b67b53fce39a8c93188262d9e795ca50750ac.zip external_mesa3d-e68b67b53fce39a8c93188262d9e795ca50750ac.tar.gz external_mesa3d-e68b67b53fce39a8c93188262d9e795ca50750ac.tar.bz2 | |
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>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/xfont.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glx/xfont.c b/src/glx/xfont.c index a086b7a..00498bc 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) { |