diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-21 16:25:58 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-21 16:25:58 (GMT) |
| commit | 1d5e719008a7c51b66cc13a0a30991af762353c1 (patch) | |
| tree | 8fd30c46b1bdb91d7e870818b760478eb06a9f16 /generic/tclDecls.h | |
| parent | 884b6dff3c37ee13afd4737b75fd7c23ed011c5d (diff) | |
| download | tcl-1d5e719008a7c51b66cc13a0a30991af762353c1.zip tcl-1d5e719008a7c51b66cc13a0a30991af762353c1.tar.gz tcl-1d5e719008a7c51b66cc13a0a30991af762353c1.tar.bz2 | |
* generic/tcl.decls: Changed the implementation of
* generic/tclBasic.c: [namespace import]; removed
* generic/tclDecls.h: Tcl_NRObjProc, replaced with
* generic/tclExecute.c: Tcl_NRCmdSwap (proposed public
* generic/tclInt.h: NRE API). This should fix
* generic/tclNRE.h: [Bug 582506].
* generic/tclNamesp.c:
* generic/tclStubInit.c:
Diffstat (limited to 'generic/tclDecls.h')
| -rw-r--r-- | generic/tclDecls.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 31e3751..b644952 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDecls.h,v 1.136 2008/07/18 13:46:43 msofer Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.137 2008/07/21 16:26:01 msofer Exp $ */ #ifndef _TCLDECLS @@ -3534,12 +3534,11 @@ EXTERN int Tcl_NREvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr, EXTERN int Tcl_NREvalObjv (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); #endif -#ifndef Tcl_NRObjProc_TCL_DECLARED -#define Tcl_NRObjProc_TCL_DECLARED +#ifndef Tcl_NRCmdSwap_TCL_DECLARED +#define Tcl_NRCmdSwap_TCL_DECLARED /* 585 */ -EXTERN int Tcl_NRObjProc (Tcl_Interp * interp, - Tcl_ObjCmdProc * objProc, - ClientData clientData); +EXTERN int Tcl_NRCmdSwap (Tcl_Interp * interp, Tcl_Command cmd, + int objc, Tcl_Obj *CONST objv[]); #endif #ifndef Tcl_NRAddCallback_TCL_DECLARED #define Tcl_NRAddCallback_TCL_DECLARED @@ -4201,7 +4200,7 @@ typedef struct TclStubs { Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_ObjCmdProc * proc, Tcl_ObjCmdProc * nreProc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 582 */ int (*tcl_NREvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 583 */ int (*tcl_NREvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 584 */ - int (*tcl_NRObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData); /* 585 */ + int (*tcl_NRCmdSwap) (Tcl_Interp * interp, Tcl_Command cmd, int objc, Tcl_Obj *CONST objv[]); /* 585 */ void (*tcl_NRAddCallback) (Tcl_Interp * interp, Tcl_NRPostProc * postProcPtr, ClientData data0, ClientData data1, ClientData data2, ClientData data3); /* 586 */ int (*tcl_NRCallObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData, int objc, Tcl_Obj *const objv[]); /* 587 */ } TclStubs; @@ -6616,9 +6615,9 @@ extern CONST TclStubs *tclStubsPtr; #define Tcl_NREvalObjv \ (tclStubsPtr->tcl_NREvalObjv) /* 584 */ #endif -#ifndef Tcl_NRObjProc -#define Tcl_NRObjProc \ - (tclStubsPtr->tcl_NRObjProc) /* 585 */ +#ifndef Tcl_NRCmdSwap +#define Tcl_NRCmdSwap \ + (tclStubsPtr->tcl_NRCmdSwap) /* 585 */ #endif #ifndef Tcl_NRAddCallback #define Tcl_NRAddCallback \ |