From 09ca9cf1cedc8027ebb6768e456d7bcae06bc818 Mon Sep 17 00:00:00 2001
From: "axel%pike.org" <axel%pike.org>
Date: Tue, 13 Jun 2000 12:10:09 +0000
Subject: [PATCH] Code cleanup, not part of build, needed for SUN Workshop
 compilers

---
 extensions/transformiix/source/xml/parser/xmltok/xmltok.h | 5 -----
 extensions/transformiix/source/xslt/Makefile.in           | 1 -
 extensions/transformiix/source/xslt/XSLTProcessor.h       | 6 +++---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/extensions/transformiix/source/xml/parser/xmltok/xmltok.h b/extensions/transformiix/source/xml/parser/xmltok/xmltok.h
index 6bbcfe1cd42e..9cddd36c442b 100644
--- a/extensions/transformiix/source/xml/parser/xmltok/xmltok.h
+++ b/extensions/transformiix/source/xml/parser/xmltok/xmltok.h
@@ -190,15 +190,12 @@ literals, comments and processing instructions.
 
 #define XmlPrologTok(enc, ptr, end, nextTokPtr) \
   (((enc)->scanners[XML_PROLOG_STATE]) (enc, ptr, end, nextTokPtr))
-//   XmlTok(enc, XML_PROLOG_STATE, ptr, end, nextTokPtr)
 
 #define XmlContentTok(enc, ptr, end, nextTokPtr) \
   (((enc)->scanners[XML_CONTENT_STATE]) (enc, ptr, end, nextTokPtr))
-//   XmlTok(enc, XML_CONTENT_STATE, ptr, end, nextTokPtr)
 
 #define XmlCdataSectionTok(enc, ptr, end, nextTokPtr) \
   (((enc)->scanners[XML_CDATA_SECTION_STATE]) (enc, ptr, end, nextTokPtr))
-//   XmlTok(enc, XML_CDATA_SECTION_STATE, ptr, end, nextTokPtr)
 
 /* This is used for performing a 2nd-level tokenization on
 the content of a literal that has already been returned by XmlTok. */ 
@@ -208,11 +205,9 @@ the content of a literal that has already been returned by XmlTok. */
 
 #define XmlAttributeValueTok(enc, ptr, end, nextTokPtr) \
   (((enc)->literalScanners[XML_ATTRIBUTE_VALUE_LITERAL])(enc, ptr, end, nextTokPtr))
-//   XmlLiteralTok(enc, XML_ATTRIBUTE_VALUE_LITERAL, ptr, end, nextTokPtr)
 
 #define XmlEntityValueTok(enc, ptr, end, nextTokPtr) \
   (((enc)->literalScanners[XML_ENTITY_VALUE_LITERAL])(enc, ptr, end, nextTokPtr))
-//   XmlLiteralTok(enc, XML_ENTITY_VALUE_LITERAL, ptr, end, nextTokPtr)
 
 #define XmlSameName(enc, ptr1, ptr2) (((enc)->sameName)(enc, ptr1, ptr2))
 
diff --git a/extensions/transformiix/source/xslt/Makefile.in b/extensions/transformiix/source/xslt/Makefile.in
index 70b460547858..82de40137661 100644
--- a/extensions/transformiix/source/xslt/Makefile.in
+++ b/extensions/transformiix/source/xslt/Makefile.in
@@ -42,7 +42,6 @@ INCLUDES += -I$(srcdir) -I$(srcdir)/../base -I$(srcdir)/../net \
   -I$(srcdir)/../xml/parser -I$(srcdir)/../xml/parser/xmlparse \
   -I$(srcdir)/../xml/printer -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \
   -I$(srcdir)/../xslt/functions
-COMPILE_CXXFLAGS += -D__cplusplus
 ifdef MOZ_XSL
 DEFINES += -DMOZILLA
 endif
diff --git a/extensions/transformiix/source/xslt/XSLTProcessor.h b/extensions/transformiix/source/xslt/XSLTProcessor.h
index ebd3ac856928..6d808050b01f 100644
--- a/extensions/transformiix/source/xslt/XSLTProcessor.h
+++ b/extensions/transformiix/source/xslt/XSLTProcessor.h
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: XSLTProcessor.h,v 1.8 2000/06/11 16:54:54 Peter.VanderBeken%pandora.be Exp $
+ * $Id: XSLTProcessor.h,v 1.9 2000/06/13 12:10:09 axel%pike.org Exp $
  */
 
 
@@ -75,7 +75,7 @@
 /**
  * A class for Processing XSL Stylesheets
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.8 $ $Date: 2000/06/11 16:54:54 $
+ * @version $Revision: 1.9 $ $Date: 2000/06/13 12:10:09 $
 **/
 class XSLTProcessor
 #ifdef MOZILLA
@@ -392,7 +392,7 @@ public:
         WHEN,
         WITH_PARAM,
         MESSAGE,
-        EXPR_DEBUG,  // temporary, used for debugging
+        EXPR_DEBUG  // temporary, used for debugging
     };
 
     XSLType(const XSLType& xslType);