diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-06-26 10:12:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-06-26 10:12:17 (GMT) |
| commit | e8d619b292256c1d44b578c2d54319527e4c5d23 (patch) | |
| tree | ea9b46a1c9e90c3711a4b86a6279dba4ebd696cb /unix | |
| parent | be1a8384ef0cb9fea37a20be396287a596c049ae (diff) | |
| parent | 1b53ef3bbd2bd4139a0fbbeaa493a2d4562b9825 (diff) | |
| download | tcl-e8d619b292256c1d44b578c2d54319527e4c5d23.zip tcl-e8d619b292256c1d44b578c2d54319527e4c5d23.tar.gz tcl-e8d619b292256c1d44b578c2d54319527e4c5d23.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 | ||||
| -rw-r--r-- | unix/tclConfig.h.in | 3 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 5 |
4 files changed, 5 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index e7dee7a..5e4da71 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -279,7 +279,7 @@ VALGRINDARGS = --tool=memcheck --num-callers=24 \ STUB_CC_SWITCHES = -I"${BUILD_DIR}" -I${UNIX_DIR} -I${GENERIC_DIR} -I${TOMMATH_DIR} \ ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ ${AC_FLAGS} ${ENV_FLAGS} ${EXTRA_CFLAGS} @EXTRA_CC_SWITCHES@ \ - ${NO_DEPRECATED_FLAGS} -DMP_FIXED_CUTOFFS -DMP_NO_STDINT + ${NO_DEPRECATED_FLAGS} -DMP_FIXED_CUTOFFS CC_SWITCHES = $(STUB_CC_SWITCHES) -DBUILD_tcl diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 5ac917c..297e1a8 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2388,7 +2388,7 @@ 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, ['long' and 'long long' have the same size]) + AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Do 'long' and 'long long' have the same size (64-bit)?]) AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in index 4d8230a..c269e59 100644 --- a/unix/tclConfig.h.in +++ b/unix/tclConfig.h.in @@ -244,6 +244,9 @@ /* Define to 1 if `st_blocks' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLOCKS +/* Define to 1 if `st_rdev' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_RDEV + /* Define to 1 if you have the <sys/epoll.h> header file. */ #undef HAVE_SYS_EPOLL_H diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index cb1adc5..178375f 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -155,11 +155,6 @@ extern "C" { # include <inttypes.h> #endif #include <limits.h> -#ifdef HAVE_STDINT_H -# include <stdint.h> -#else -# include "../compat/stdint.h" -#endif #include <unistd.h> MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode); |