[Emacs-diffs] /srv/bzr/emacs/trunk r100933: * src/vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100933
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-28 23:12:38 -0700
message:
  * src/vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.
  Remove reference to __osf__, unused.
modified:
  src/ChangeLog
  src/vm-limit.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-29 05:58:58 +0000
+++ b/src/ChangeLog     2010-07-29 06:12:38 +0000
@@ -1,5 +1,8 @@
 2010-07-29  Dan Nicolaescu  <address@hidden>
 
+       * vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.
+       Remove reference to __osf__, unused.
+
        * mem-limits.h: Remove duplicated includes.
        (NULL): Remove definition, unused.
        (POINTER): Remove definition.

=== modified file 'src/vm-limit.c'
--- a/src/vm-limit.c    2010-07-25 14:13:30 +0000
+++ b/src/vm-limit.c    2010-07-29 06:12:38 +0000
@@ -25,10 +25,6 @@
 
 #include "mem-limits.h"
 
-#ifdef HAVE_GETRLIMIT
-#include <sys/resource.h>
-#endif
-
 /*
   Level number of warnings already issued.
   0 -- no warnings issued.
@@ -100,7 +96,7 @@
 }
 
 #else
-#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN)
+#if !defined (BSD4_2) && !defined (CYGWIN)
 
 #ifdef MSDOS
 void
@@ -148,7 +144,7 @@
 }
 #endif /* not MSDOS */
 
-#else /* BSD4_2 */
+#else /* BSD4_2 || CYGWIN */
 
 static void
 get_lim_data (void)