138 lines
5 KiB
Text
138 lines
5 KiB
Text
$NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
|
|
--- tclexpat.c.orig Sat Aug 22 03:35:44 1998
|
|
+++ tclexpat.c Fri Sep 28 18:52:35 2001
|
|
@@ -19,7 +19,7 @@
|
|
*/
|
|
|
|
#include <tcl.h>
|
|
-#include "xmlparse.h"
|
|
+#include <expat.h>
|
|
|
|
/*
|
|
* The structure below is used to refer to an expat parser object.
|
|
@@ -847,11 +847,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -917,11 +917,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -976,11 +976,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -1036,11 +1036,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -1095,11 +1095,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -1169,11 +1169,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -1241,11 +1241,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -1306,11 +1306,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|
|
@@ -1370,11 +1370,11 @@
|
|
* It would be desirable to be able to terminate parsing
|
|
* if the return result is TCL_ERROR or TCL_BREAK.
|
|
*/
|
|
-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0)
|
|
+#if (TCL_MAJOR_VERSION == 8)
|
|
result = Tcl_GlobalEvalObj(expat->interp, cmdPtr);
|
|
#else
|
|
result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL);
|
|
-#endif /* if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION */
|
|
+#endif /* if TCL_MAJOR_VERSION == 8 */
|
|
|
|
Tcl_DecrRefCount(cmdPtr);
|
|
Tcl_Release((ClientData) expat->interp);
|