=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: msxml3: Declare debug channels only when needed (Clang).
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 23 09:04:46 CST 2015
Module: wine
Branch: master
Commit: 10148677266c7fdd7f6f6a36bf1781ce6735760a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=10148677266c7fdd7f6f6a36bf1781ce6735760a
Author: André Hentschel <nerv at dawncrow.de>
Date: Sat Feb 21 14:58:41 2015 +0100
msxml3: Declare debug channels only when needed (Clang).
---
dlls/msxml3/attribute.c | 4 ++--
dlls/msxml3/cdata.c | 4 ++--
dlls/msxml3/comment.c | 4 ++--
dlls/msxml3/docfrag.c | 4 ++--
dlls/msxml3/doctype.c | 4 ++--
dlls/msxml3/domdoc.c | 4 ++--
dlls/msxml3/domimpl.c | 4 ++--
dlls/msxml3/element.c | 4 ++--
dlls/msxml3/entityref.c | 4 ++--
dlls/msxml3/httprequest.c | 4 ++--
dlls/msxml3/main.c | 4 ++--
dlls/msxml3/node.c | 4 ++--
dlls/msxml3/nodelist.c | 4 ++--
dlls/msxml3/nodemap.c | 4 ++--
dlls/msxml3/pi.c | 4 ++--
dlls/msxml3/saxreader.c | 4 ++--
dlls/msxml3/schema.c | 4 ++--
dlls/msxml3/selection.c | 4 ++--
dlls/msxml3/text.c | 4 ++--
dlls/msxml3/xdr.c | 4 ++--
dlls/msxml3/xmldoc.c | 4 ++--
dlls/msxml3/xmlelem.c | 4 ++--
dlls/msxml3/xmlview.c | 4 ++--
23 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index bb0655c..637615b 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -39,10 +39,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
static const xmlChar xmlns[] = "xmlns";
typedef struct _domattr
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index 2fcacff..c255b1b 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -38,10 +38,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct
{
xmlnode node;
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index 12a584d..0317c4f 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -38,10 +38,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct _domcomment
{
xmlnode node;
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index 1b56885..b2dd3e5 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -38,10 +38,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct _domfrag
{
xmlnode node;
diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c
index 322b6c2..79d74d9 100644
--- a/dlls/msxml3/doctype.c
+++ b/dlls/msxml3/doctype.c
@@ -39,10 +39,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct _domdoctype
{
xmlnode node;
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 2244172..71cf077 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -52,10 +52,10 @@
#include "msxml_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
/* not defined in older versions */
#define XML_SAVE_FORMAT 1
#define XML_SAVE_NO_DECL 2
diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
index e286e57..74223d5 100644
--- a/dlls/msxml3/domimpl.c
+++ b/dlls/msxml3/domimpl.c
@@ -38,10 +38,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct _domimpl
{
DispatchEx dispex;
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
index 0de9c34..38d3b47 100644
--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
@@ -39,10 +39,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
static const xmlChar DT_prefix[] = "dt";
static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes";
diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
index 1c0309a..5d5d424 100644
--- a/dlls/msxml3/entityref.c
+++ b/dlls/msxml3/entityref.c
@@ -38,10 +38,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct _entityref
{
xmlnode node;
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index cf53db4..aab41f7 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -48,10 +48,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
static const WCHAR colspaceW[] = {':',' ',0};
static const WCHAR crlfW[] = {'\r','\n',0};
static const DWORD safety_supported_options =
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 81ce1f4..1905f57 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -56,12 +56,12 @@
#include "msxml_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
HINSTANCE MSXML_hInstance = NULL;
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap)
{
enum __wine_debug_class dbcl;
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 92063be..1178e60 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -53,10 +53,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
#ifdef SONAME_LIBXSLT
extern void* libxslt_handle;
# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
index c68eefc..2c1d10e 100644
--- a/dlls/msxml3/nodelist.c
+++ b/dlls/msxml3/nodelist.c
@@ -48,10 +48,10 @@
* thus the child is inaccessible by an XPath query
*/
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct
{
DispatchEx dispex;
diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index 1eed3d5..2ad6f12 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -40,10 +40,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct
{
DispatchEx dispex;
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index 96fb118..cea9570 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -38,10 +38,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct _dom_pi
{
xmlnode node;
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index a926fed..5061413 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -45,10 +45,10 @@
#include "msxml_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef enum
{
FeatureUnknown = 0,
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index d694cb3..7a1f8b3 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -48,6 +48,8 @@
#include "msxml_private.h"
+#ifdef HAVE_LIBXML2
+
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
/* We use a chained hashtable, which can hold any number of schemas
@@ -58,8 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
/* This is just the number of buckets, should be prime */
#define DEFAULT_HASHTABLE_SIZE 17
-#ifdef HAVE_LIBXML2
-
xmlDocPtr XDR_to_XSD_doc(xmlDocPtr xdr_doc, xmlChar const* nsURI);
static const xmlChar XSD_schema[] = "schema";
diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c
index 6a72550..b7c560a 100644
--- a/dlls/msxml3/selection.c
+++ b/dlls/msxml3/selection.c
@@ -52,10 +52,10 @@
*
*/
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
int registerNamespaces(xmlXPathContextPtr ctxt);
xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str);
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index 411f6eb..3a12d4b 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -40,10 +40,10 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct _domtext
{
xmlnode node;
diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c
index fd7a9b7..b5e91bc 100644
--- a/dlls/msxml3/xdr.c
+++ b/dlls/msxml3/xdr.c
@@ -28,14 +28,14 @@
#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
/* Both XDR and XSD are valid XML
* We just convert the doc tree, no need for a parser.
*/
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
static const xmlChar DT_prefix[] = "dt";
static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes";
static const xmlChar XDR_href[] = "urn:schemas-microsoft-com:xml-data";
diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
index 730ff6e..6f4c73e 100644
--- a/dlls/msxml3/xmldoc.c
+++ b/dlls/msxml3/xmldoc.c
@@ -42,10 +42,10 @@
#include "msxml_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
/* FIXME: IXMLDocument needs to implement
* - IXMLError
* - IPersistMoniker
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index e1ef0eb..96b2007 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -39,10 +39,10 @@
#include "msxml_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
static HRESULT XMLElementCollection_create( xmlNodePtr node, LPVOID *ppObj );
/**********************************************************************
diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c
index 4c7a142..2bf58f8 100644
--- a/dlls/msxml3/xmlview.c
+++ b/dlls/msxml3/xmlview.c
@@ -40,10 +40,10 @@
#include "msxml_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
#ifdef HAVE_LIBXML2
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
typedef struct
{
IPersistMoniker IPersistMoniker_iface;
More information about the wine-cvs
mailing list