diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-04-16 17:34:32 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-04-16 17:34:32 (GMT) |
| commit | 133a3b34b7419b202d6588f44871ea67176a5064 (patch) | |
| tree | f8807513443db51250cd659eecc2f63a00958162 /generic | |
| parent | f54af08a171ccb68fa91d72cead431736ff19908 (diff) | |
| parent | 40691feec1993222d76235c047d25b488d08310b (diff) | |
| download | tcl-133a3b34b7419b202d6588f44871ea67176a5064.zip tcl-133a3b34b7419b202d6588f44871ea67176a5064.tar.gz tcl-133a3b34b7419b202d6588f44871ea67176a5064.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclDecls.h | 10 | ||||
| -rw-r--r-- | generic/tclPkg.c | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index a1c0bf4..5fda514 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3809,6 +3809,16 @@ extern const TclStubs *tclStubsPtr; #undef Tcl_SeekOld #undef Tcl_TellOld +#undef Tcl_PkgPresent +#define Tcl_PkgPresent(interp, name, version, exact) \ + Tcl_PkgPresentEx(interp, name, version, exact, NULL) +#undef Tcl_PkgProvide +#define Tcl_PkgProvide(interp, name, version) \ + Tcl_PkgProvideEx(interp, name, version, NULL) +#undef Tcl_PkgRequire +#define Tcl_PkgRequire(interp, name, version, exact) \ + Tcl_PkgRequireEx(interp, name, version, exact, NULL) + /* * Deprecated Tcl procedures: */ diff --git a/generic/tclPkg.c b/generic/tclPkg.c index 07f62a4..df90cea 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -949,7 +949,7 @@ Tcl_PackageObjCmd( version = TclGetString(objv[3]); } } - Tcl_PkgPresent(interp, name, version, exact); + Tcl_PkgPresentEx(interp, name, version, exact, NULL); return TCL_ERROR; break; } @@ -974,7 +974,7 @@ Tcl_PackageObjCmd( if (CheckVersionAndConvert(interp, argv3, NULL, NULL) != TCL_OK) { return TCL_ERROR; } - return Tcl_PkgProvide(interp, argv2, argv3); + return Tcl_PkgProvideEx(interp, argv2, argv3, NULL); case PKG_REQUIRE: require: if (objc < 3) { |