diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2016-01-23 20:28:19 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2016-01-23 20:28:19 (GMT) |
| commit | 1acb0742e2003b2986c75a8f0967b7a7fdd5d661 (patch) | |
| tree | 17e6862de7202f1e8aa203b4d9ce71e48c3abd01 /unix | |
| parent | d8bdd23bc64b9a515924bf2f8c38345a1ee46c0a (diff) | |
| parent | 095b587df14e39ec71e1f4a638516f371c8ce861 (diff) | |
| download | tcl-1acb0742e2003b2986c75a8f0967b7a7fdd5d661.zip tcl-1acb0742e2003b2986c75a8f0967b7a7fdd5d661.tar.gz tcl-1acb0742e2003b2986c75a8f0967b7a7fdd5d661.tar.bz2 | |
merge
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rw-r--r-- | unix/dltest/pkge.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixFCmd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index f2e72f7..ed9d9fb 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1823,7 +1823,7 @@ gendate: # -e 's?SCCSID?RCS: @(#) ?' \ # -e '/#ifdef __STDC__/,/#endif/d' -e '/TclDateerrlab:/d' \ # -e '/TclDatenewstate:/d' -e '/#pragma/d' \ -# -e '/#include <inttypes.h>/d' -e 's/const /CONST /g' \ +# -e '/#include <inttypes.h>/d' \ # -e '/#define YYNEW/s/malloc/TclDateAlloc/g' \ # -e '/#define YYENLARGE/,/realloc/s/realloc/TclDateRealloc/g' \ # <y.tab.c >$(GENERIC_DIR)/tclDate.c diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c index d616352..395cd0e 100644 --- a/unix/dltest/pkge.c +++ b/unix/dltest/pkge.c @@ -50,5 +50,5 @@ Pkge_Init( if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { return TCL_ERROR; } - return Tcl_Eval(interp, script); + return Tcl_EvalEx(interp, script, -1, 0); } diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 3b1b6ca..a1a409e 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -564,7 +564,7 @@ TclUnixCopyFile( #define BINMODE #endif /* DJGPP */ -#define DEFAULT_COPY_BLOCK_SIZE 4069 +#define DEFAULT_COPY_BLOCK_SIZE 4096 if ((srcFd = TclOSopen(src, O_RDONLY BINMODE, 0)) < 0) { /* INTL: Native */ return TCL_ERROR; |