# HG changeset patch
# User Ken Brown <kbrown@cornell.edu>
# Date 1280065608 14400
# Node ID d09c98c3dd7410f953613a81f12936267429599d
# Parent  1eca4fd49be3da81ad858ac090386cac2dd731aa
Cygwin build cleanup (Bug#6715).
* mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead...
* vm-limit.c: ...add 'defined (CYGWIN)' here.

diff -r 1eca4fd49be3 -r d09c98c3dd74 src/ChangeLog
--- a/src/ChangeLog	Sun Jul 25 20:50:51 2010 +0900
+++ b/src/ChangeLog	Sun Jul 25 09:46:48 2010 -0400
@@ -1,3 +1,8 @@
+2010-07-25  Ken Brown  <kbrown@cornell.edu>
+
+	* mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead...
+	* vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715).
+
 2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
 
 	* callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT.
diff -r 1eca4fd49be3 -r d09c98c3dd74 src/mem-limits.h
--- a/src/mem-limits.h	Sun Jul 25 20:50:51 2010 +0900
+++ b/src/mem-limits.h	Sun Jul 25 09:46:48 2010 -0400
@@ -34,10 +34,6 @@
 # endif
 #endif
 
-#ifdef CYGWIN
-#define BSD4_2
-#endif
-
 #ifdef BSD4_2
 #include <sys/time.h>
 #include <sys/resource.h>
diff -r 1eca4fd49be3 -r d09c98c3dd74 src/vm-limit.c
--- a/src/vm-limit.c	Sun Jul 25 20:50:51 2010 +0900
+++ b/src/vm-limit.c	Sun Jul 25 09:46:48 2010 -0400
@@ -100,7 +100,7 @@
 }
 
 #else
-#if !defined (BSD4_2) && !defined (__osf__)
+#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN)
 
 #ifdef MSDOS
 void
@@ -173,9 +173,9 @@
 check_memory_limits (void)
 {
 #ifdef REL_ALLOC
-  extern POINTER (*real_morecore) (SIZE);
+  extern POINTER (*real_morecore) ();
 #endif
-  extern POINTER (*__morecore) (SIZE);
+  extern POINTER (*__morecore) ();
 
   register POINTER cp;
   unsigned long five_percent;