summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-24 21:09:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-24 21:09:33 (GMT)
commitfc30e5e70489dbfbf19ff74d9a3bd6d29f75b4b1 (patch)
tree611f9668b6ebc7a57d2cf5c705d9a6ab595a9b9b /unix
parentf49e4099fe9298366fb4d972c58799d8ad38b2e4 (diff)
parent414896d31fc17726a8380347db1f306066ca6c70 (diff)
downloadtcl-fc30e5e70489dbfbf19ff74d9a3bd6d29f75b4b1.zip
tcl-fc30e5e70489dbfbf19ff74d9a3bd6d29f75b4b1.tar.gz
tcl-fc30e5e70489dbfbf19ff74d9a3bd6d29f75b4b1.tar.bz2
Merge 8.7
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure6
-rw-r--r--unix/tcl.m45
2 files changed, 7 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index f01d67d..4c54fbe 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7641,8 +7641,8 @@ printf "%s\n" "${tcl_flags}" >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit integer type" >&5
-printf %s "checking for 64-bit integer type... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if 'long' and 'long long' have the same size (64-bit)?" >&5
+printf %s "checking if 'long' and 'long long' have the same size (64-bit)?... " >&6; }
if test ${tcl_cv_type_64bit+y}
then :
printf %s "(cached) " >&6
@@ -7679,6 +7679,8 @@ printf "%s\n" "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
# Now check for auxiliary declarations
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
printf %s "checking for struct dirent64... " >&6; }
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index cf9f711..5ac917c 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2378,7 +2378,7 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[
#--------------------------------------------------------------------
AC_DEFUN([SC_TCL_64BIT_FLAGS], [
- AC_MSG_CHECKING([for 64-bit integer type])
+ AC_MSG_CHECKING([if 'long' and 'long long' have the same size (64-bit)?])
AC_CACHE_VAL(tcl_cv_type_64bit,[
tcl_cv_type_64bit=none
# See if we could use long anyway Note that we substitute in the
@@ -2388,9 +2388,10 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
case 1: case (sizeof(long long)==sizeof(long)): ;
}]])],[tcl_cv_type_64bit="long long"],[])])
if test "${tcl_cv_type_64bit}" = none ; then
- AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Do 'long' and 'long long' have the same size (64-bit)?])
+ AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, ['long' and 'long long' have the same size])
AC_MSG_RESULT([yes])
else
+ AC_MSG_RESULT([no])
# Now check for auxiliary declarations
AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>