Module: wine Branch: master Commit: 58fe32e1eaa2686fe0ad0bdb1a0e080862d4c2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58fe32e1eaa2686fe0ad0bdb1a...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Mar 16 13:02:24 2012 +0100
msxml3: Avoid building code that isn't used without libxml.
---
dlls/msxml3/xmlview.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index 5434667..f3e7f89 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -42,6 +42,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#ifdef HAVE_LIBXML2 + typedef struct { IPersistMoniker IPersistMoniker_iface; @@ -1422,7 +1424,6 @@ static IOleObjectVtbl XMLView_OleObjectVtbl = { XMLView_OleObject_SetColorScheme };
-#ifdef HAVE_LIBXML2 HRESULT XMLView_create(IUnknown *outer, void **ppObj) { XMLView *This; @@ -1453,11 +1454,14 @@ HRESULT XMLView_create(IUnknown *outer, void **ppObj) *ppObj = &This->IPersistMoniker_iface; return S_OK; } + #else + HRESULT XMLView_create(IUnknown *outer, void **ppObj) { MESSAGE("This program tried to use a XMLView object, but\n" "libxml2 support was not present at compile time.\n"); return E_NOTIMPL; } -#endif + +#endif /* HAVE_LIBXML2 */