diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-15 15:00:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-15 15:00:25 (GMT) |
| commit | 4eed3070235df260454bc98556ccd8598f413797 (patch) | |
| tree | 13fe040674c48c44be96716753d9b83ba1159b38 /unix | |
| parent | 0dd94666f5099a23663af11342dbb3a37f170e15 (diff) | |
| parent | 346cce57455de92d12fcef5ea4115a9657458b84 (diff) | |
| download | tcl-4eed3070235df260454bc98556ccd8598f413797.zip tcl-4eed3070235df260454bc98556ccd8598f413797.tar.gz tcl-4eed3070235df260454bc98556ccd8598f413797.tar.bz2 | |
merge core-8-branch. Also fix some test-cases, expecting the existence of "int" objType.
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 10 | ||||
| -rw-r--r-- | unix/tcl.m4 | 1 | ||||
| -rw-r--r-- | unix/tclConfig.h.in | 3 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 5 |
4 files changed, 1 insertions, 18 deletions
diff --git a/unix/configure b/unix/configure index 129c283..51d694f 100755 --- a/unix/configure +++ b/unix/configure @@ -3733,16 +3733,6 @@ $as_echo "#define NO_DIRENT_H 1" >>confdefs.h fi - ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default" -if test "x$ac_cv_header_float_h" = xyes; then : - -else - -$as_echo "#define NO_FLOAT_H 1" >>confdefs.h - -fi - - ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default" if test "x$ac_cv_header_values_h" = xyes; then : diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 45922e0..9aa3eb2 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2078,7 +2078,6 @@ closedir(d); AC_DEFINE(NO_DIRENT_H, 1, [Do we have <dirent.h>?]) fi - AC_CHECK_HEADER(float.h, , [AC_DEFINE(NO_FLOAT_H, 1, [Do we have <float.h>?])]) AC_CHECK_HEADER(values.h, , [AC_DEFINE(NO_VALUES_H, 1, [Do we have <values.h>?])]) AC_CHECK_HEADER(stdlib.h, tcl_ok=1, tcl_ok=0) AC_EGREP_HEADER(strtol, stdlib.h, , tcl_ok=0) diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in index adbc80d..28ce012 100644 --- a/unix/tclConfig.h.in +++ b/unix/tclConfig.h.in @@ -295,9 +295,6 @@ /* Do we have fd_set? */ #undef NO_FD_SET -/* Do we have <float.h>? */ -#undef NO_FLOAT_H - /* Do we have fstatfs()? */ #undef NO_FSTATFS diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index ba56089..8b766d6 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -181,13 +181,10 @@ extern int TclUnixSetBlockingMode(int fd, int mode); *--------------------------------------------------------------------------- */ -#ifndef NO_FLOAT_H -# include <float.h> -#else +#include <float.h> #ifndef NO_VALUES_H # include <values.h> #endif -#endif #ifndef FLT_MAX # ifdef MAXFLOAT |