[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/vm-limit.c,v
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/src/vm-limit.c,v |
Date: |
Sun, 03 Aug 2008 08:52:04 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Andreas Schwab <schwab> 08/08/03 08:52:03
Index: vm-limit.c
===================================================================
RCS file: /sources/emacs/emacs/src/vm-limit.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- vm-limit.c 2 Aug 2008 22:35:21 -0000 1.24
+++ vm-limit.c 3 Aug 2008 08:52:03 -0000 1.25
@@ -148,7 +148,11 @@
extern POINTER (*__morecore) ();
register POINTER cp;
+#if defined (HAVE_GETRLIMIT) && ! defined (CYGWIN)
+ rlim_t five_percent;
+#else
unsigned long five_percent;
+#endif
unsigned long data_size;
enum warnlevel new_warnlevel;
@@ -163,7 +167,6 @@
|| rlimit.rlim_cur > rlimit.rlim_max)
return;
five_percent = rlimit.rlim_max / 20;
- data_size = rlimit.rlim_cur;
#else /* not HAVE_GETRLIMIT */
@@ -171,6 +174,8 @@
get_lim_data ();
five_percent = lim_data / 20;
+#endif /* not HAVE_GETRLIMIT */
+
/* Find current end of memory and issue warning if getting near max */
#ifdef REL_ALLOC
if (real_morecore)
@@ -180,8 +185,6 @@
cp = (char *) (*__morecore) (0);
data_size = (char *) cp - (char *) data_space_start;
-#endif /* not HAVE_GETRLIMIT */
-
if (!warn_function)
return;