diff options
| author | sebres <sebres@users.sourceforge.net> | 2017-03-06 20:18:35 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2017-03-06 20:18:35 (GMT) |
| commit | 9f13ce8038e4c27cab5d0ee977a61ca48bde2b73 (patch) | |
| tree | 2c581478c211e56c314bcaaeef4a690e7da31ed7 /generic/tclDecls.h | |
| parent | c88fb138612db4499a9e841453cd14bfd5db7224 (diff) | |
| parent | ae0c48521551ffe6af28967e0c3b848836fb632e (diff) | |
| download | tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.zip tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.tar.gz tcl-9f13ce8038e4c27cab5d0ee977a61ca48bde2b73.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclDecls.h')
| -rw-r--r-- | generic/tclDecls.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 49ac440..0dbf345 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3797,7 +3797,6 @@ extern const TclStubs *tclStubsPtr; # undef Tcl_SetVar # undef Tcl_ObjSetVar2 # undef Tcl_StaticPackage -# undef TclFSGetNativePath # define Tcl_CreateInterp() (tclStubsPtr->tcl_CreateInterp()) # define Tcl_GetStringResult(interp) (tclStubsPtr->tcl_GetStringResult(interp)) # define Tcl_Init(interp) (tclStubsPtr->tcl_Init(interp)) @@ -3864,6 +3863,28 @@ extern const TclStubs *tclStubsPtr; #undef Tcl_UpVar #define Tcl_UpVar(interp, frameName, varName, localName, flags) \ Tcl_UpVar2(interp, frameName, varName, NULL, localName, flags) +#undef Tcl_AddErrorInfo +#define Tcl_AddErrorInfo(interp, message) \ + Tcl_AppendObjToErrorInfo(interp, Tcl_NewStringObj(message, -1)) +#undef Tcl_AddObjErrorInfo +#define Tcl_AddObjErrorInfo(interp, message, length) \ + Tcl_AppendObjToErrorInfo(interp, Tcl_NewStringObj(message, length)) +#ifdef TCL_NO_DEPRECATED +#undef Tcl_SetResult +#define Tcl_SetResult(interp, result, freeProc) \ + do { \ + char *__result = result; \ + Tcl_FreeProc *__freeProc = freeProc; \ + Tcl_SetObjResult(interp, Tcl_NewStringObj(__result, -1)); \ + if (__result != NULL && __freeProc != NULL && __freeProc != TCL_VOLATILE) { \ + if (__freeProc == TCL_DYNAMIC) { \ + ckfree(__result); \ + } else { \ + (*__freeProc)(__result); \ + } \ + } \ + } while(0) +#endif /* TCL_NO_DEPRECATED */ #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) # if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG) |