From: Ken Brown <kbrown@cornell.edu>
Date: Sun, 25 Jul 2010 13:46:48 +0000 (-0400)
Subject: Cygwin build cleanup (Bug#6715).
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~136^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2493307567916477f9b7862835e1b112b385da2e;p=emacs.git

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 339e7b2beb2..78bd22db812 100644
--- 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 a550e1464b8..8827c458c02 100644
--- 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 06801db1a90..a08c300c14d 100644
--- 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;