From bd2793a0c62dbe3dffb4c4d395df7793e64ae251 Mon Sep 17 00:00:00 2001 From: rfm Date: Tue, 7 Nov 2006 18:37:36 +0000 Subject: [PATCH] Applied Davids SAX handler fixups git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24050 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/Additions/GSXML.m | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d79d2a5c6..1637ba1fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-07 David Wetzel + + * Source/Additions/GSXML.m: + Fix error setting start and end element for SAX. + 2006-11-06 Richard Frith-Macdonald * Source/NSObject.m: Use %p to print address in description. diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m index 32d2dba45..c675662e7 100644 --- a/Source/Additions/GSXML.m +++ b/Source/Additions/GSXML.m @@ -3318,10 +3318,9 @@ fatalErrorFunction(void *ctx, const unsigned char *msg, ...) xmlSAXVersion(LIB, 2); // Set SAX2 LIB->startElementNs = (void*) startElementNsFunction; LIB->endElementNs = (void*) endElementNsFunction; -#else +#endif LIB->startElement = (void*) startElementFunction; LIB->endElement = (void*) endElementFunction; -#endif LIB->internalSubset = (void*) internalSubsetFunction; LIB->externalSubset = (void*) externalSubsetFunction; LIB->isStandalone = (void*) isStandaloneFunction; @@ -3440,10 +3439,9 @@ fatalErrorFunction(void *ctx, const unsigned char *msg, ...) xmlSAXVersion(LIB, 2); // Set SAX2 SETCB(startElementNs, startElement:prefix:href:attributes:); SETCB(endElementNs, endElement:prefix:href:); -#else +#endif SETCB(startElement, startElement:attributes:); SETCB(endElement, endElement:); -#endif SETCB(internalSubset, internalSubset:externalID:systemID:); SETCB(externalSubset, externalSubset:externalID:systemID:); SETCB(isStandalone, isStandalone);