diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-01-18 14:05:07 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-01-18 14:05:07 (GMT) |
| commit | bed15f1d818f47f742436c164c9967c25ae31ee0 (patch) | |
| tree | 41685338f076619a5bc62e26ad87df9685b37d6c /generic/tclBasic.c | |
| parent | c8219a9a2995c5658cd709f4bb7b5b933e6575e9 (diff) | |
| parent | 7ea11c7f9865dc680b102ea9497fc75634be25e4 (diff) | |
| download | tcl-bed15f1d818f47f742436c164c9967c25ae31ee0.zip tcl-bed15f1d818f47f742436c164c9967c25ae31ee0.tar.gz tcl-bed15f1d818f47f742436c164c9967c25ae31ee0.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index ece20f6..52f26a9 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -132,8 +132,10 @@ static Tcl_NRPostProc NRCoroutineCallerCallback; static Tcl_NRPostProc NRCoroutineExitCallback; static Tcl_NRPostProc NRCommand; +#if !defined(TCL_NO_DEPRECATED) static Tcl_ObjCmdProc OldMathFuncProc; static void OldMathFuncDeleteProc(ClientData clientData); +#endif /* !defined(TCL_NO_DEPRECATED) */ static void ProcessUnexpectedResult(Tcl_Interp *interp, int returnCode); static int RewindCoroutine(CoroutineData *corPtr, int result); @@ -205,7 +207,7 @@ static const CmdInfo builtInCmds[] = { {"append", Tcl_AppendObjCmd, TclCompileAppendCmd, NULL, CMD_IS_SAFE}, {"apply", Tcl_ApplyObjCmd, NULL, TclNRApplyObjCmd, CMD_IS_SAFE}, {"break", Tcl_BreakObjCmd, TclCompileBreakCmd, NULL, CMD_IS_SAFE}, -#ifndef TCL_NO_DEPRECATED +#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 {"case", Tcl_CaseObjCmd, NULL, NULL, CMD_IS_SAFE}, #endif {"catch", Tcl_CatchObjCmd, TclCompileCatchCmd, TclNRCatchObjCmd, CMD_IS_SAFE}, @@ -3520,6 +3522,7 @@ TclCleanupCommand( *---------------------------------------------------------------------- */ +#if !defined(TCL_NO_DEPRECATED) void Tcl_CreateMathFunc( Tcl_Interp *interp, /* Interpreter in which function is to be @@ -3570,7 +3573,7 @@ Tcl_CreateMathFunc( static int OldMathFuncProc( - ClientData clientData, /* Ponter to OldMathFuncData describing the + ClientData clientData, /* Pointer to OldMathFuncData describing the * function being called */ Tcl_Interp *interp, /* Tcl interpreter */ int objc, /* Actual parameter count */ @@ -3851,6 +3854,7 @@ Tcl_ListMathFuncs( return result; } +#endif /* !defined(TCL_NO_DEPRECATED) */ /* *---------------------------------------------------------------------- |