[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100897: Cygwin build cleanup (Bug#67
From: |
Ken Brown |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100897: Cygwin build cleanup (Bug#6715). |
Date: |
Sun, 25 Jul 2010 09:46:48 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100897
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-25 09:46:48 -0400
message:
Cygwin build cleanup (Bug#6715).
* mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead...
* vm-limit.c: ...add 'defined (CYGWIN)' here.
modified:
src/ChangeLog
src/mem-limits.h
src/vm-limit.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-25 00:20:51 +0000
+++ b/src/ChangeLog 2010-07-25 13:46:48 +0000
@@ -1,3 +1,8 @@
+2010-07-25 Ken Brown <address@hidden>
+
+ * 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 <address@hidden>
* callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT.
=== modified file 'src/mem-limits.h'
--- a/src/mem-limits.h 2010-07-08 03:03:52 +0000
+++ b/src/mem-limits.h 2010-07-25 13:46:48 +0000
@@ -34,10 +34,6 @@
# endif
#endif
-#ifdef CYGWIN
-#define BSD4_2
-#endif
-
#ifdef BSD4_2
#include <sys/time.h>
#include <sys/resource.h>
=== modified file 'src/vm-limit.c'
--- a/src/vm-limit.c 2010-07-25 00:20:51 +0000
+++ b/src/vm-limit.c 2010-07-25 13:46:48 +0000
@@ -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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100897: Cygwin build cleanup (Bug#6715).,
Ken Brown <=