[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[vicki]

The following commit has been merged in the debian/unstable branch:
commit 9853f0f511312a692c840d4a19ff93dc9e990fdf
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 20:03:46 2004 +0000

            Reviewed by Vicki.
    
            - fixed Tiger build
    
            * kwq/KWQXmlSimpleReader.mm: (QXmlSimpleReader::parse):
            Changed SAX structure initialization code so it compiles with both the newer
            and older libxml. Not sure this will work right with namespaces with the new
            libxml; we'll have to test.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6138 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2014a2e..6e14e38 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-03-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Vicki.
+
+        - fixed Tiger build
+
+        * kwq/KWQXmlSimpleReader.mm: (QXmlSimpleReader::parse):
+        Changed SAX structure initialization code so it compiles with both the newer
+        and older libxml. Not sure this will work right with namespaces with the new
+        libxml; we'll have to test.
+
 2004-03-01  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me, as suggested by Darin
diff --git a/WebCore/kwq/KWQXmlSimpleReader.mm b/WebCore/kwq/KWQXmlSimpleReader.mm
index 2aa4a1a..088c1b4 100644
--- a/WebCore/kwq/KWQXmlSimpleReader.mm
+++ b/WebCore/kwq/KWQXmlSimpleReader.mm
@@ -232,13 +232,10 @@ bool QXmlSimpleReader::parse(const QXmlInputSource &input)
         xmlInitParser();
         didInit = true;
     }
-    xmlSAXHandler handler = {
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-        NULL, NULL, NULL, NULL, NULL, NULL, normalErrorHandler, fatalErrorHandler,
-        NULL, NULL, NULL,
-        0
-    };
+    xmlSAXHandler handler;
+    memset(&handler, 0, sizeof(handler));
+    handler.error = normalErrorHandler;
+    handler.fatalError = fatalErrorHandler;
     if (_contentHandler) {
         handler.characters = charactersHandler;
         handler.endElement = endElementHandler;

-- 
WebKit Debian packaging