merge core-8-4-branch

4 files changed, 22 insertions, 18 deletions

diff --git a/win/configure b/win/configure
index 29b1245..062e8a4 100755
--- a/win/configure
+++ b/win/configure
@@ -2013,6 +2013,10 @@ fi
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 	DBGX=""
+	cat >> confdefs.h <<\EOF
+#define NDEBUG 1
+EOF
+
 	echo "$ac_t""no" 1>&6
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
@@ -2059,7 +2063,7 @@ TCL_DBGX=${DBGX}
 #--------------------------------------------------------------------
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2063: checking how to run the C preprocessor" >&5
+echo "configure:2067: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2074,13 +2078,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2078 "configure"
+#line 2082 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2091,13 +2095,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2095 "configure"
+#line 2099 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2108,13 +2112,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2112 "configure"
+#line 2116 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2140,17 +2144,17 @@ echo "$ac_t""$CPP" 1>&6
 
 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for errno.h""... $ac_c" 1>&6
-echo "configure:2144: checking for errno.h" >&5
+echo "configure:2148: checking for errno.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2149 "configure"
+#line 2153 "configure"
 #include "confdefs.h"
 #include <errno.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
diff --git a/win/tcl.m4 b/win/tcl.m4
index ab47afc..708efc48 100755
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -38,7 +38,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
 	    AC_MSG_ERROR(There is no tclConfig.sh in $TCL_BIN_DIR:  perhaps you did not specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
 	fi
 	TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../unix; pwd`
-	CFLAGS="$CFLAGS -mwin32"
     fi
     AC_MSG_RESULT($TCL_BIN_DIR/tclConfig.sh)
 ])
@@ -304,6 +303,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 	DBGX=""
+	AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?])
 	AC_MSG_RESULT([no])
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
@@ -317,12 +317,12 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
     AC_SUBST(LDFLAGS_DEFAULT)
 
     if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
-	AC_DEFINE(TCL_MEM_DEBUG)
+	AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?])
     fi
 
     if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then
-	AC_DEFINE(TCL_COMPILE_DEBUG)
-	AC_DEFINE(TCL_COMPILE_STATS)
+	AC_DEFINE(TCL_COMPILE_DEBUG, 1, [Is bytecode debugging enabled?])
+	AC_DEFINE(TCL_COMPILE_STATS, 1, [Are bytecode statistics enabled?])
     fi
 
     if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 2c6150f..69d1838 100755
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -223,7 +223,7 @@ WinLink(LinkSource, LinkTarget, linkAction)
 
     /* Make sure source file doesn't exist */
     attr = (*tclWinProcs->getFileAttributesProc)(LinkSource);
-    if (attr != 0xffffffff) {
+    if (attr != -1) {
 	Tcl_SetErrno(EEXIST);
 	return -1;
     }
@@ -237,7 +237,7 @@ WinLink(LinkSource, LinkTarget, linkAction)
     }
     /* Check the target */
     attr = (*tclWinProcs->getFileAttributesProc)(LinkTarget);
-    if (attr == 0xffffffff) {
+    if (attr == -1) {
 	/* The target doesn't exist */
 	TclWinConvertError(GetLastError());
 	return -1;
@@ -301,7 +301,7 @@ WinReadLink(LinkSource)
 
     /* Make sure source file does exist */
     attr = (*tclWinProcs->getFileAttributesProc)(LinkSource);
-    if (attr == 0xffffffff) {
+    if (attr == -1) {
 	/* The source doesn't exist */
 	TclWinConvertError(GetLastError());
 	return NULL;
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index acaf705..fc09ef5 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -673,7 +673,7 @@ TclpSetVariables(interp)
 		TCL_GLOBAL_ONLY);
     }
 
-#ifdef _DEBUG
+#ifndef NDEBUG
     /*
      * The existence of the "debug" element of the tcl_platform array indicates
      * that this particular Tcl shell has been compiled with debug information.