View | Details | Raw Unified | Return to bug 279968 | Differences between
and this patch

Collapse All | Expand All

(-)docObj.c (-3 / +7 lines)
Lines 1852-1860 void Link Here
1852
}
1852
}
1853
1853
1854
void
1854
void
1855
TclXML_libxml2_ErrorHandler (ctx, error)
1855
TclXML_libxml2_ErrorHandler (void *ctx,
1856
     void *ctx; /* ignore - depends on context */
1856
#if LIBXML_VERSION >= 21200
1857
     xmlErrorPtr error;
1857
        const xmlError *error
1858
#else
1859
        xmlError *error
1860
#endif
1861
        )
1858
{
1862
{
1859
  ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1863
  ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
1860
  Tcl_Obj *objPtr;
1864
  Tcl_Obj *objPtr;
(-)include/tclxml-libxml2/tclxml-libxml2Decls.h (-2 / +13 lines)
Lines 55-61 EXTERN void TclXML_libxml2_ErrorHandler _ANSI_ARGS_(( Link Here
55
				TclXML_libxml2_DocumentHandling keep));
55
				TclXML_libxml2_DocumentHandling keep));
56
/* 10 */
56
/* 10 */
57
EXTERN void		TclXML_libxml2_ErrorHandler _ANSI_ARGS_((void * ctx, 
57
EXTERN void		TclXML_libxml2_ErrorHandler _ANSI_ARGS_((void * ctx, 
58
				xmlErrorPtr error));
58
#if LIBXML_VERSION >= 21200
59
				const xmlError *error));
60
#else
61
				xmlError *error));
62
#endif
63
59
/* 11 */
64
/* 11 */
60
EXTERN void		TclXML_libxml2_ResetError _ANSI_ARGS_((
65
EXTERN void		TclXML_libxml2_ResetError _ANSI_ARGS_((
61
				Tcl_Interp * interp));
66
				Tcl_Interp * interp));
Lines 93-99 typedef struct Tclxml_libxml2Stubs { Link Here
93
    int (*tclXML_libxml2_GetTclDocFromNode) _ANSI_ARGS_((Tcl_Interp * interp, xmlNodePtr nodePtr, TclXML_libxml2_Document ** tDocPtrPtr)); /* 7 */
98
    int (*tclXML_libxml2_GetTclDocFromNode) _ANSI_ARGS_((Tcl_Interp * interp, xmlNodePtr nodePtr, TclXML_libxml2_Document ** tDocPtrPtr)); /* 7 */
94
    void (*tclXML_libxml2_DestroyDocument) _ANSI_ARGS_((TclXML_libxml2_Document * tDocPtr)); /* 8 */
99
    void (*tclXML_libxml2_DestroyDocument) _ANSI_ARGS_((TclXML_libxml2_Document * tDocPtr)); /* 8 */
95
    void (*tclXML_libxml2_DocKeep) _ANSI_ARGS_((Tcl_Obj * objPtr, TclXML_libxml2_DocumentHandling keep)); /* 9 */
100
    void (*tclXML_libxml2_DocKeep) _ANSI_ARGS_((Tcl_Obj * objPtr, TclXML_libxml2_DocumentHandling keep)); /* 9 */
96
    void (*tclXML_libxml2_ErrorHandler) _ANSI_ARGS_((void * ctx, xmlErrorPtr error)); /* 10 */
101
    void (*tclXML_libxml2_ErrorHandler) _ANSI_ARGS_((void * ctx,
102
#if LIBXML_VERSION >= 21200
103
                const xmlError * error
104
#else
105
                xmlError * error
106
#endif
107
                )); /* 10 */
97
    void (*tclXML_libxml2_ResetError) _ANSI_ARGS_((Tcl_Interp * interp)); /* 11 */
108
    void (*tclXML_libxml2_ResetError) _ANSI_ARGS_((Tcl_Interp * interp)); /* 11 */
98
    Tcl_Obj * (*tclXML_libxml2_GetErrorObj) _ANSI_ARGS_((Tcl_Interp * interp)); /* 12 */
109
    Tcl_Obj * (*tclXML_libxml2_GetErrorObj) _ANSI_ARGS_((Tcl_Interp * interp)); /* 12 */
99
    void (*tclXML_libxml2_SetErrorNodeFunc) _ANSI_ARGS_((Tcl_Interp * interp, TclXML_ErrorNodeHandlerProc * proc)); /* 13 */
110
    void (*tclXML_libxml2_SetErrorNodeFunc) _ANSI_ARGS_((Tcl_Interp * interp, TclXML_ErrorNodeHandlerProc * proc)); /* 13 */
(-)tclxml.c (+2 lines)
Lines 20-25 Link Here
20
#include <tclxslt/tclxslt.h>
20
#include <tclxslt/tclxslt.h>
21
#include <string.h>
21
#include <string.h>
22
22
23
int Tcldom_libxml2_Init ( Tcl_Interp *interp );
24
23
#define TCL_DOES_STUBS \
25
#define TCL_DOES_STUBS \
24
    (TCL_MAJOR_VERSION > 8 || TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION > 1 || \
26
    (TCL_MAJOR_VERSION > 8 || TCL_MAJOR_VERSION == 8 && (TCL_MINOR_VERSION > 1 || \
25
    (TCL_MINOR_VERSION == 1 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE)))
27
    (TCL_MINOR_VERSION == 1 && TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE)))

Return to bug 279968