change code exclusion style to make sure that the excluded code still compiles

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index eaefb6f4763496a1f0ad83c80a3aa6ad8a5b9e05..122045b1ee1f576b0a63541f718fdbfae789d1aa 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -3010,7 +3010,6 @@ doContent(XML_Parser parser,
         enum XML_Error result;
         if (parser->m_startCdataSectionHandler)
           parser->m_startCdataSectionHandler(parser->m_handlerArg);
-#if 0
         /* Suppose you doing a transformation on a document that involves
            changing only the character data.  You set up a defaultHandler
            and a characterDataHandler.  The defaultHandler simply copies
@@ -3023,9 +3022,8 @@ doContent(XML_Parser parser,
            However, now we have a start/endCdataSectionHandler, so it seems
            easier to let the user deal with this.
         */
-        else if (parser->m_characterDataHandler)
+        else if (0 && parser->m_characterDataHandler)
           parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf, 0);
-#endif
         else if (parser->m_defaultHandler)
           reportDefault(parser, enc, s, next);
         result = doCdataSection(parser, enc, &next, end, nextPtr, haveMore);
@@ -3722,11 +3720,9 @@ doCdataSection(XML_Parser parser,
     case XML_TOK_CDATA_SECT_CLOSE:
       if (parser->m_endCdataSectionHandler)
         parser->m_endCdataSectionHandler(parser->m_handlerArg);
-#if 0
       /* see comment under XML_TOK_CDATA_SECT_OPEN */
-      else if (parser->m_characterDataHandler)
+      else if (0 && parser->m_characterDataHandler)
         parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf, 0);
-#endif
       else if (parser->m_defaultHandler)
         reportDefault(parser, enc, s, next);
       *startPtr = next;

diff --git a/expat/xmlwf/xmlmime.c b/expat/xmlwf/xmlmime.c
index c530979060f468676b1927004dc571a4127c257c..e7676e64a4d6d5fe4dac8cfc380c0bce450a4d0b 100644 (file)
--- a/expat/xmlwf/xmlmime.c
+++ b/expat/xmlwf/xmlmime.c
@@ -132,10 +132,10 @@ getXMLCharset(const char *buf, char *charset)
   if (!p || *p != '/')
     return;
   p = getTok(&next);
-#if 0
-  if (!matchkey(p, next, "xml") && charset[0] == '\0')
-    return;
-#endif
+  if (0) {
+    if (!matchkey(p, next, "xml") && charset[0] == '\0')
+      return;
+  }
   p = getTok(&next);
   while (p) {
     if (*p == ';') {