Cygwin build cleanup (Bug#6715).

* mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead...
* vm-limit.c: ...add 'defined (CYGWIN)' here.

diff --git a/src/ChangeLog b/src/ChangeLog
index 339e7b2beb2707fccd9eb4186a1688dd40ba92f3..78bd22db8128b193dc9f10daf2af7b1da43f5df0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/mem-limits.h b/src/mem-limits.h
index a550e1464b82fc90bca48f768e52c579b95115c4..8827c458c02f071ed5d86a7bb6aba727dd319ad0 100644 (file)
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -34,10 +34,6 @@ extern int etext;
 # endif
 #endif
 
-#ifdef CYGWIN
-#define BSD4_2
-#endif
-
 #ifdef BSD4_2
 #include <sys/time.h>
 #include <sys/resource.h>

diff --git a/src/vm-limit.c b/src/vm-limit.c
index 06801db1a909f6368f47ddafb706065f8e6bc9ec..a08c300c14d2b3657beed2642febf29df3cedb2d 100644 (file)
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -100,7 +100,7 @@ get_lim_data (void)
 }
 
 #else
-#if !defined (BSD4_2) && !defined (__osf__)
+#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN)
 
 #ifdef MSDOS
 void
@@ -173,9 +173,9 @@ static void
 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;