|
From: <dv...@us...> - 2009-12-24 19:50:18
|
Update of /cvsroot/aolserver/aolserver/nsd In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7904/nsd Modified Files: adpeval.c tclloop.c Log Message: fixes for tcl8.6 compatibility Index: adpeval.c =================================================================== RCS file: /cvsroot/aolserver/aolserver/nsd/adpeval.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** adpeval.c 28 Jun 2006 17:41:06 -0000 1.49 --- adpeval.c 24 Dec 2009 19:50:07 -0000 1.50 *************** *** 837,841 **** if (framePtr != NULL) { Ns_DStringPrintf(&ds, "\n at line %d of ", ! framePtr->line + interp->errorLine); } inc = ""; --- 837,841 ---- if (framePtr != NULL) { Ns_DStringPrintf(&ds, "\n at line %d of ", ! framePtr->line + Tcl_GetErrorLine(interp)); } inc = ""; Index: tclloop.c =================================================================== RCS file: /cvsroot/aolserver/aolserver/nsd/tclloop.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tclloop.c 20 Jun 2008 08:06:32 -0000 1.3 --- tclloop.c 24 Dec 2009 19:50:08 -0000 1.4 *************** *** 158,162 **** char msg[32 + TCL_INTEGER_SPACE]; ! sprintf(msg, "\n (\"for\" body line %d)",interp->errorLine); Tcl_AddErrorInfo(interp, msg); } --- 158,162 ---- char msg[32 + TCL_INTEGER_SPACE]; ! sprintf(msg, "\n (\"for\" body line %d)",Tcl_GetErrorLine(interp)); Tcl_AddErrorInfo(interp, msg); } *************** *** 243,247 **** sprintf(msg, "\n (\"while\" body line %d)", ! interp->errorLine); Tcl_AddErrorInfo(interp, msg); } --- 243,247 ---- sprintf(msg, "\n (\"while\" body line %d)", ! Tcl_GetErrorLine(interp)); Tcl_AddErrorInfo(interp, msg); } *************** *** 461,465 **** sprintf(msg, "\n (\"foreach\" body line %d)", ! interp->errorLine); Tcl_AddObjErrorInfo(interp, msg, -1); break; --- 461,465 ---- sprintf(msg, "\n (\"foreach\" body line %d)", ! Tcl_GetErrorLine(interp)); Tcl_AddObjErrorInfo(interp, msg, -1); break; |