ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml3: Fix compilation on systems that don't have xsltInit(). 

Reduce the scope of xsltInit().
Remove an include that was needed only for xsltInit().
This commit is contained in:
Francois Gouget 2008-11-19 08:40:25 +01:00 committed by Alexandre Julliard
parent a815677d93
commit 681d375136
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msxml3/main.c
View File

@ -49,7 +49,6 @@ HRESULT WINAPI DllCanUnloadNow(void)
void* libxslt_handle = NULL; void* libxslt_handle = NULL;
#ifdef SONAME_LIBXSLT #ifdef SONAME_LIBXSLT
# define DECL_FUNCPTR(f) typeof(f) * p##f = NULL # define DECL_FUNCPTR(f) typeof(f) * p##f = NULL
DECL_FUNCPTR(xsltInit);
DECL_FUNCPTR(xsltApplyStylesheet); DECL_FUNCPTR(xsltApplyStylesheet);
DECL_FUNCPTR(xsltCleanupGlobals); DECL_FUNCPTR(xsltCleanupGlobals);
DECL_FUNCPTR(xsltFreeStylesheet); DECL_FUNCPTR(xsltFreeStylesheet);
@ -60,6 +59,8 @@ DECL_FUNCPTR(xsltParseStylesheetDoc);
static void init_libxslt(void) static void init_libxslt(void)
{ {
#ifdef SONAME_LIBXSLT #ifdef SONAME_LIBXSLT
void (*pxsltInit)(void); /* Missing in libxslt <= 1.1.14 */
libxslt_handle = wine_dlopen(SONAME_LIBXSLT, RTLD_NOW, NULL, 0); libxslt_handle = wine_dlopen(SONAME_LIBXSLT, RTLD_NOW, NULL, 0);
if (!libxslt_handle) if (!libxslt_handle)
return; return;

2
dlls/msxml3/msxml_private.h
View File

@ -102,10 +102,8 @@ void* libxslt_handle;
# endif # endif
# include <libxslt/xsltutils.h> # include <libxslt/xsltutils.h>
# include <libxslt/xsltInternals.h> # include <libxslt/xsltInternals.h>
# include <libxslt/xslt.h>
# define MAKE_FUNCPTR(f) extern typeof(f) * p##f # define MAKE_FUNCPTR(f) extern typeof(f) * p##f
MAKE_FUNCPTR(xsltInit);
MAKE_FUNCPTR(xsltApplyStylesheet); MAKE_FUNCPTR(xsltApplyStylesheet);
MAKE_FUNCPTR(xsltCleanupGlobals); MAKE_FUNCPTR(xsltCleanupGlobals);
MAKE_FUNCPTR(xsltFreeStylesheet); MAKE_FUNCPTR(xsltFreeStylesheet);