Mercurial > emacs
changeset 109575:ad36da121d41
* src/vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.
Remove reference to __osf__, unused.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 28 Jul 2010 23:12:38 -0700 |
| parents | 0f876b86540d |
| children | faeb6f3341b1 |
| files | src/ChangeLog src/vm-limit.c |
| diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jul 28 22:58:58 2010 -0700 +++ b/src/ChangeLog Wed Jul 28 23:12:38 2010 -0700 @@ -1,5 +1,8 @@ 2010-07-29 Dan Nicolaescu <dann@ics.uci.edu> + * 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.
--- a/src/vm-limit.c Wed Jul 28 22:58:58 2010 -0700 +++ b/src/vm-limit.c Wed Jul 28 23:12:38 2010 -0700 @@ -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)