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/tclBasic.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/tclBasic.c')
-rw-r--r-- | generic/tclBasic.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index e2d3712..273afea 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.309 2008/07/14 01:38:00 msofer Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.310 2008/07/14 08:22:13 dkf Exp $ */ #include "tclInt.h" @@ -4234,8 +4234,8 @@ int TclEvalObjv_NR2( while (recordPtr->callbackPtr) { TEOV_callback *callbackPtr = recordPtr->callbackPtr; - result = (*callbackPtr->procPtr)(&callbackPtr->data0, - interp, result); + + result = callbackPtr->procPtr(callbackPtr->data, interp, result); callbackPtr = callbackPtr->nextPtr; TclSmallFree(recordPtr->callbackPtr); recordPtr->callbackPtr = callbackPtr; @@ -7674,10 +7674,10 @@ void TclNR_AddCallback( TclSmallAlloc(sizeof(TEOV_callback), callbackPtr); callbackPtr->procPtr = postProcPtr; - callbackPtr->data0 = data0; - callbackPtr->data1 = data1; - callbackPtr->data2 = data2; - callbackPtr->data3 = data3; + callbackPtr->data[0] = data0; + callbackPtr->data[1] = data1; + callbackPtr->data[2] = data2; + callbackPtr->data[3] = data3; callbackPtr->nextPtr = recordPtr->callbackPtr; recordPtr->callbackPtr = callbackPtr; |