Alexandre Julliard : winex11: Make sure that all fontconfig support is properly #ifdef'ed.
Alexandre Julliard
julliard at winehq.org
Wed May 19 10:34:15 CDT 2010
Module: wine
Branch: master
Commit: b81d08e31c512e66c33779935e9668a648e38409
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81d08e31c512e66c33779935e9668a648e38409
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed May 19 11:26:44 2010 +0200
winex11: Make sure that all fontconfig support is properly #ifdef'ed.
---
dlls/winex11.drv/xrender.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 9678def..b7e0c2f 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -194,6 +194,7 @@ MAKE_FUNCPTR(FcPatternDestroy)
MAKE_FUNCPTR(FcPatternAddInteger)
MAKE_FUNCPTR(FcPatternAddString)
MAKE_FUNCPTR(FcPatternGetInteger)
+static void *fontconfig_handle;
static BOOL fontconfig_installed;
#endif
@@ -341,7 +342,6 @@ static int load_xrender_formats(void)
void X11DRV_XRender_Init(void)
{
int event_base, i;
- void *fontconfig_handle;
if (client_side_with_render &&
wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0) &&
@@ -395,6 +395,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform)
}
}
+#ifdef SONAME_LIBFONTCONFIG
if ((fontconfig_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0)))
{
#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fontconfig_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;}
@@ -411,6 +412,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform)
fontconfig_installed = pFcInit();
}
else TRACE( "cannot find the fontconfig library " SONAME_LIBFONTCONFIG "\n" );
+#endif
sym_not_found:
if(X11DRV_XRender_Installed || client_side_with_core)
More information about the wine-cvs
mailing list