Code cleanup, not part of build, needed for SUN Workshop compilers

This commit is contained in:
axel%pike.org 2000-06-13 12:10:09 +00:00
Родитель a5180078a1
Коммит 09ca9cf1ce
3 изменённых файлов: 3 добавлений и 9 удалений

Просмотреть файл

@ -190,15 +190,12 @@ literals, comments and processing instructions.
#define XmlPrologTok(enc, ptr, end, nextTokPtr) \ #define XmlPrologTok(enc, ptr, end, nextTokPtr) \
(((enc)->scanners[XML_PROLOG_STATE]) (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) \ #define XmlContentTok(enc, ptr, end, nextTokPtr) \
(((enc)->scanners[XML_CONTENT_STATE]) (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) \ #define XmlCdataSectionTok(enc, ptr, end, nextTokPtr) \
(((enc)->scanners[XML_CDATA_SECTION_STATE]) (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 /* This is used for performing a 2nd-level tokenization on
the content of a literal that has already been returned by XmlTok. */ 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) \ #define XmlAttributeValueTok(enc, ptr, end, nextTokPtr) \
(((enc)->literalScanners[XML_ATTRIBUTE_VALUE_LITERAL])(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) \ #define XmlEntityValueTok(enc, ptr, end, nextTokPtr) \
(((enc)->literalScanners[XML_ENTITY_VALUE_LITERAL])(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)) #define XmlSameName(enc, ptr1, ptr2) (((enc)->sameName)(enc, ptr1, ptr2))

Просмотреть файл

@ -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/parser -I$(srcdir)/../xml/parser/xmlparse \
-I$(srcdir)/../xml/printer -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \ -I$(srcdir)/../xml/printer -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \
-I$(srcdir)/../xslt/functions -I$(srcdir)/../xslt/functions
COMPILE_CXXFLAGS += -D__cplusplus
ifdef MOZ_XSL ifdef MOZ_XSL
DEFINES += -DMOZILLA DEFINES += -DMOZILLA
endif endif

Просмотреть файл

@ -21,7 +21,7 @@
* Keith Visco, kvisco@ziplink.net * Keith Visco, kvisco@ziplink.net
* -- original author. * -- 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 * A class for Processing XSL Stylesheets
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a> * @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 class XSLTProcessor
#ifdef MOZILLA #ifdef MOZILLA
@ -392,7 +392,7 @@ public:
WHEN, WHEN,
WITH_PARAM, WITH_PARAM,
MESSAGE, MESSAGE,
EXPR_DEBUG, // temporary, used for debugging EXPR_DEBUG // temporary, used for debugging
}; };
XSLType(const XSLType& xslType); XSLType(const XSLType& xslType);