diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2008-07-14 08:22:11 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2008-07-14 08:22:11 (GMT) |
| commit | 0e87dee6653b2bbae46ab63cf98efb4b06b7380c (patch) | |
| tree | 79720d937b6a45b4d2198754f72cf26f406a40b6 /generic/tclProc.c | |
| parent | 8d88b8afd68de02f280b0221a74a1116bb4f06dd (diff) | |
| download | tcl-0e87dee6653b2bbae46ab63cf98efb4b06b7380c.zip tcl-0e87dee6653b2bbae46ab63cf98efb4b06b7380c.tar.gz tcl-0e87dee6653b2bbae46ab63cf98efb4b06b7380c.tar.bz2 | |
Store ClientDatas in NRE callback storage as an array; that's how they are
referred to in callback implementations anyway.
Diffstat (limited to 'generic/tclProc.c')
| -rw-r--r-- | generic/tclProc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclProc.c b/generic/tclProc.c index 70f2921..4ecd57f 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclProc.c,v 1.144 2008/07/14 00:11:33 msofer Exp $ + * RCS: @(#) $Id: tclProc.c,v 1.145 2008/07/14 08:22:14 dkf Exp $ */ #include "tclInt.h" @@ -1735,7 +1735,7 @@ TclObjInterpProcCore( if (result == TCL_OK) { result = TclExecuteByteCode(interp, record.data.codePtr); result = TclEvalObjv_NR2(interp, result, rootPtr); - result = InterpProcNR2(&record.callbackPtr->data0, interp, result); + result = InterpProcNR2(record.callbackPtr->data, interp, result); TclSmallFree(record.callbackPtr); } return result; @@ -2816,8 +2816,9 @@ TclNRApplyObjCmd( /* Fix the recordPtr! */ TEOV_record *recordPtr = TOP_RECORD(iPtr); + recordPtr->callbackPtr->procPtr = ApplyNR2; - recordPtr->callbackPtr->data2 = extraPtr; + recordPtr->callbackPtr->data[2] = extraPtr; } } if (result != TCL_OK) { |