*** include/libxml/tree.h.orig	Mon Aug 22 05:14:24 2005
--- include/libxml/tree.h	Sat Jan  7 13:31:22 2006
***************
*** 452,458 ****
      struct _xmlAttr *properties;/* properties list */
      xmlNs           *nsDef;     /* namespace definitions on this node */
      void            *psvi;	/* for type/PSVI informations */
!     unsigned short   line;	/* line number */
      unsigned short   extra;	/* extra data for XPath/XSLT */
  };
  
--- 452,458 ----
      struct _xmlAttr *properties;/* properties list */
      xmlNs           *nsDef;     /* namespace definitions on this node */
      void            *psvi;	/* for type/PSVI informations */
!     int              line;	/* line number */
      unsigned short   extra;	/* extra data for XPath/XSLT */
  };
  
*** SAX2.c.orig	Sat Sep  3 08:27:39 2005
--- SAX2.c	Sat Jan  7 13:32:43 2006
***************
*** 1561,1570 ****
      ctxt->nodemem = -1;
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	    if (ctxt->input->line < 65535)
! 		ret->line = (short) ctxt->input->line;
! 	    else
! 	        ret->line = 65535;
  	}
      }
  
--- 1561,1567 ----
      ctxt->nodemem = -1;
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	    ret->line = ctxt->input->line;
  	}
      }
  
***************
*** 2164,2173 ****
      }
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	    if (ctxt->input->line < 65535)
! 		ret->line = (short) ctxt->input->line;
! 	    else
! 	        ret->line = 65535;
  	}
      }
  
--- 2161,2167 ----
      }
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	    ret->line = ctxt->input->line;
  	}
      }
  
***************
*** 2507,2516 ****
  
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	    if (ctxt->input->line < 65535)
! 		ret->line = (short) ctxt->input->line;
! 	    else
! 	        ret->line = 65535;
  	}
      }
      if (ctxt->inSubset == 1) {
--- 2501,2507 ----
  
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	   ret->line = ctxt->input->line;
  	}
      }
      if (ctxt->inSubset == 1) {
***************
*** 2567,2576 ****
      if (ret == NULL) return;
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	    if (ctxt->input->line < 65535)
! 		ret->line = (short) ctxt->input->line;
! 	    else
! 	        ret->line = 65535;
  	}
      }
  
--- 2558,2564 ----
      if (ret == NULL) return;
      if (ctxt->linenumbers) {
  	if (ctxt->input != NULL) {
! 	    ret->line = ctxt->input->line;
  	}
      }
  
