summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/system.h4
-rw-r--r--configure.in2
3 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 10aa13960..97b1f3be0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-14  Bart Schaefer  <schaefer@zsh.org>
 
+	* Andrej: 12620: configure.in, Src/system.h: Fix cache variable
+	test for mmap, remove cygwin special-case.
+
 	* 12617: configure.in: Use AC_FUNC_MMAP rather than just test for
 	existence of mmap.
 
diff --git a/Src/system.h b/Src/system.h
index 3d23f5761..a48ee9075 100644
--- a/Src/system.h
+++ b/Src/system.h
@@ -647,7 +647,3 @@ extern short ospeed;
 #if defined(CONFIG_LOCALE) && defined(HAVE_SETLOCALE) && defined(LC_ALL)
 # define USE_LOCALE 1
 #endif /* CONFIG_LOCALE && HAVE_SETLOCALE && LC_ALL */
-
-#ifdef __CYGWIN__
-# undef HAVE_MMAP
-#endif
diff --git a/configure.in b/configure.in
index 026abab42..2b1c13e28 100644
--- a/configure.in
+++ b/configure.in
@@ -870,7 +870,7 @@ AC_CHECK_FUNCS(strftime difftime gettimeofday \
 AC_FUNC_STRCOLL
 
 AC_FUNC_MMAP
-if test $ac_cv_func_mmap = yes; then
+if test x$ac_cv_func_mmap_fixed_mapped = xyes; then
   AC_CHECK_FUNCS(munmap msync)
 fi