summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclBinary.c6
-rw-r--r--generic/tclEvent.c2
-rw-r--r--generic/tclIOUtil.c2
-rwxr-xr-xwin/configure6
-rw-r--r--win/tcl.m46
5 files changed, 11 insertions, 11 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 58583f4..4e977f2 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -2500,7 +2500,8 @@ BinaryEncode64(
return TCL_ERROR;
}
if (maxlen < 0) {
- Tcl_SetResult(interp, "line length out of range", TCL_STATIC);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(
+ "line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
"LINE_LENGTH", NULL);
return TCL_ERROR;
@@ -2606,7 +2607,8 @@ BinaryEncodeUu(
return TCL_ERROR;
}
if (lineLength < 3 || lineLength > 85) {
- Tcl_SetResult(interp, "line length out of range", TCL_STATIC);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(
+ "line length out of range", -1));
Tcl_SetErrorCode(interp, "TCL", "BINARY", "ENCODE",
"LINE_LENGTH", NULL);
return TCL_ERROR;
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 686b80d..941d566 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1171,8 +1171,6 @@ Tcl_Finalize(void)
TclFinalizeEncodingSubsystem();
- Tcl_SetPanicProc(NULL);
-
/*
* Repeat finalization of the thread local storage once more. Although
* this step is already done by the Tcl_FinalizeThread call above, series
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 6332453..6259216 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1944,7 +1944,7 @@ TclNREvalFile(
iPtr->evalFlags |= TCL_EVAL_FILE;
TclNRAddCallback(interp, EvalFileCallback, oldScriptFile, pathPtr, objPtr,
NULL);
- return TclNREvalObjEx(interp, objPtr, TCL_EVAL_DIRECT, NULL, INT_MIN);
+ return TclNREvalObjEx(interp, objPtr, 0, NULL, INT_MIN);
}
static int
diff --git a/win/configure b/win/configure
index e7c1329..be9c98a 100755
--- a/win/configure
+++ b/win/configure
@@ -3449,6 +3449,8 @@ echo "${ECHO_T}yes" >&6
# set various compiler flags depending on whether we are using gcc or cl
if test "${GCC}" = "yes" ; then
+ extra_cflags="-pipe"
+ extra_ldflags="-pipe"
echo "$as_me:$LINENO: checking for mingw32 version of gcc" >&5
echo $ECHO_N "checking for mingw32 version of gcc... $ECHO_C" >&6
if test "${ac_cv_win32+set}" = set; then
@@ -3577,6 +3579,7 @@ echo "${ECHO_T}$ac_cv_municode" >&6
extra_ldflags="$extra_ldflags -municode"
else
extra_cflags="$extra_cflags -DTCL_BROKEN_MAINARGS"
+ extra_ldflags="$extra_ldflags -static-libgcc"
fi
fi
@@ -3599,9 +3602,6 @@ echo $ECHO_N "checking compiler flags... $ECHO_C" >&6
MAKE_EXE="\${CC} -o \$@"
LIBPREFIX="lib"
- extra_cflags="$extra_cflags -pipe"
- extra_ldflags="$extra_ldflags -pipe"
-
if test "${SHARED_BUILD}" = "0" ; then
# static
echo "$as_me:$LINENO: result: using static flags" >&5
diff --git a/win/tcl.m4 b/win/tcl.m4
index 7a1aa02..335494b 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -633,6 +633,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# set various compiler flags depending on whether we are using gcc or cl
if test "${GCC}" = "yes" ; then
+ extra_cflags="-pipe"
+ extra_ldflags="-pipe"
AC_CACHE_CHECK(for mingw32 version of gcc,
ac_cv_win32,
AC_TRY_COMPILE([
@@ -663,6 +665,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
extra_ldflags="$extra_ldflags -municode"
else
extra_cflags="$extra_cflags -DTCL_BROKEN_MAINARGS"
+ extra_ldflags="$extra_ldflags -static-libgcc"
fi
fi
@@ -684,9 +687,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
MAKE_EXE="\${CC} -o \[$]@"
LIBPREFIX="lib"
- extra_cflags="$extra_cflags -pipe"
- extra_ldflags="$extra_ldflags -pipe"
-
if test "${SHARED_BUILD}" = "0" ; then
# static
AC_MSG_RESULT([using static flags])