diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-08 07:47:39 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-08 07:47:39 (GMT) |
commit | 4a54b3c89a0f656a1c344bcb5978e55be37c6081 (patch) | |
tree | ec60328bc3ab31071f8fd60a6a0d1498f64dc0c2 /unix | |
parent | 6b9a02967b15922a009bf5c013cd4c284d4bdb02 (diff) | |
parent | 9ee975c8c8e562243af687aedf8cba7797a56b54 (diff) | |
download | tcl-4a54b3c89a0f656a1c344bcb5978e55be37c6081.zip tcl-4a54b3c89a0f656a1c344bcb5978e55be37c6081.tar.gz tcl-4a54b3c89a0f656a1c344bcb5978e55be37c6081.tar.bz2 |
Merge-mark 8.5 (TZ update already done here)
Don't try to compile with MINGW32_ in /unix directory.
Minor comment fix.
Diffstat (limited to 'unix')
-rwxr-xr-x | unix/configure | 2 | ||||
-rw-r--r-- | unix/tcl.m4 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure index 627d10a..b064de4 100755 --- a/unix/configure +++ b/unix/configure @@ -8713,7 +8713,7 @@ fi case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; + CYGWIN_*) ;; IRIX*) ;; NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 7d4185bb..24e00cd 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1986,7 +1986,7 @@ dnl # preprocessing tests use only CPPFLAGS. case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*|MINGW32_*) ;; + CYGWIN_*) ;; IRIX*) ;; NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;; Darwin-*) ;; @@ -2114,13 +2114,13 @@ dnl # preprocessing tests use only CPPFLAGS. # # Defines some of the following vars: # NO_DIRENT_H +# NO_FLOAT_H # NO_VALUES_H # NO_STDLIB_H # NO_STRING_H # NO_SYS_WAIT_H # NO_DLFCN_H # HAVE_SYS_PARAM_H -# # HAVE_STRING_H ? # #-------------------------------------------------------------------- |