diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-14 06:28:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-14 06:28:53 (GMT) |
| commit | 741a599b04aaa2c468cb4bee879af588cdaf75bd (patch) | |
| tree | a4cecc43d9755aa3e71da1cf267e4c6844516107 /win | |
| parent | 63b5fd2631b35315fa851fa150f6e647e655d458 (diff) | |
| parent | f70e1f98b3e5235a48e0fbea21515ed7e277e6cd (diff) | |
| download | tcl-741a599b04aaa2c468cb4bee879af588cdaf75bd.zip tcl-741a599b04aaa2c468cb4bee879af588cdaf75bd.tar.gz tcl-741a599b04aaa2c468cb4bee879af588cdaf75bd.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclAppInit.c | 4 | ||||
| -rw-r--r-- | win/tclWinFCmd.c | 4 | ||||
| -rw-r--r-- | win/tclWinInit.c | 2 | ||||
| -rw-r--r-- | win/tclWinPipe.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/win/tclAppInit.c b/win/tclAppInit.c index 59c21e5..de5f788 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -29,7 +29,7 @@ extern Tcl_PackageInitProc Tcltest_Init; extern Tcl_PackageInitProc Tcltest_SafeInit; #endif /* TCL_TEST */ -#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES +#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES extern Tcl_PackageInitProc Registry_Init; extern Tcl_PackageInitProc Dde_Init; extern Tcl_PackageInitProc Dde_SafeInit; @@ -164,7 +164,7 @@ Tcl_AppInit( return TCL_ERROR; } -#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES +#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES if (Registry_Init(interp) == TCL_ERROR) { return TCL_ERROR; } diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index 6750d29..ad4bae1 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -1560,7 +1560,7 @@ GetWinFileAttributes( } } - *attributePtrPtr = Tcl_NewWideIntObj(attr != 0); + TclNewIntObj(*attributePtrPtr, attr != 0); return TCL_OK; } @@ -1926,7 +1926,7 @@ TclpObjListVolumes(void) int i; char *p; - resultPtr = Tcl_NewObj(); + TclNewObj(resultPtr); /* * On Win32s: diff --git a/win/tclWinInit.c b/win/tclWinInit.c index 9378641..868ebd9 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -189,7 +189,7 @@ TclpInitLibraryPath( const char *bytes; int length; - pathPtr = Tcl_NewObj(); + TclNewObj(pathPtr); /* * Initialize the substring used when locating the script library. The diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index 14270f8..a93688d 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.c @@ -2771,7 +2771,7 @@ Tcl_PidObjCmd( } pipePtr = (PipeInfo *) Tcl_GetChannelInstanceData(chan); - resultPtr = Tcl_NewObj(); + TclNewObj(resultPtr); for (i = 0; i < pipePtr->numPids; i++) { Tcl_ListObjAppendElement(/*interp*/ NULL, resultPtr, Tcl_NewWideIntObj((unsigned) |