[Lxml-checkins] r39354 - lxml/branch/nscleanup/src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Sat Feb 24 15:27:52 2007
New Revision: 39354

Modified:
   lxml/branch/nscleanup/src/lxml/parser.pxi
   lxml/branch/nscleanup/src/lxml/tree.pxd
Log:
merged in int -> enum fix from trunk

Modified: lxml/branch/nscleanup/src/lxml/parser.pxi
==============================================================================
--- lxml/branch/nscleanup/src/lxml/parser.pxi	(original)
+++ lxml/branch/nscleanup/src/lxml/parser.pxi	Sat Feb 24 15:27:52 2007
@@ -160,7 +160,7 @@
 
 cdef char* _findEncodingName(char* buffer, int size):
     "Work around bug in libxml2: find iconv name of encoding on our own."
-    cdef int enc
+    cdef tree.xmlCharEncoding enc
     enc = tree.xmlDetectCharEncoding(buffer, size)
     if enc == tree.XML_CHAR_ENCODING_UTF16LE:
         return "UTF16LE"

Modified: lxml/branch/nscleanup/src/lxml/tree.pxd
==============================================================================
--- lxml/branch/nscleanup/src/lxml/tree.pxd	(original)
+++ lxml/branch/nscleanup/src/lxml/tree.pxd	Sat Feb 24 15:27:52 2007
@@ -36,9 +36,9 @@
 
     ctypedef struct xmlCharEncodingHandler
     cdef xmlCharEncodingHandler* xmlFindCharEncodingHandler(char* name)
-    cdef xmlCharEncodingHandler* xmlGetCharEncodingHandler(int enc)
+    cdef xmlCharEncodingHandler* xmlGetCharEncodingHandler(xmlCharEncoding enc)
     cdef int xmlCharEncCloseFunc(xmlCharEncodingHandler* handler)
-    cdef int xmlDetectCharEncoding(char* text, int len)
+    cdef xmlCharEncoding xmlDetectCharEncoding(char* text, int len)
     cdef char* xmlGetCharEncodingName(xmlCharEncoding enc)
 
 cdef extern from "libxml/hash.h":