msxml3: Declare debug channels only when needed (Clang).

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

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;

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;

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;

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;

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

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;

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";
 

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;

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 =

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;

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

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;

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;

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;

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,

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";

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);
 

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;

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";

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

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 );
 
 /**********************************************************************

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;