diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-07-28 23:12:38 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-07-28 23:12:38 -0700 |
| commit | 0441987e88af1ad9a55cb025f7c8894b7e067522 (patch) | |
| tree | 122c517434b32dd7ae2a9ed840a917e6cddf127b /src | |
| parent | 56a000c73d1162d01f97384f6fa54106f9caeb17 (diff) | |
| download | emacs-0441987e88af1ad9a55cb025f7c8894b7e067522.tar.gz | |
* src/vm-limit.c: Do not include sys/resource.h, mem-limits.h does it.
Remove reference to __osf__, unused.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/vm-limit.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f3f56c1a7e7..a68019de4f0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/vm-limit.c b/src/vm-limit.c index 71ad82d687e..e0bd77a2516 100644 --- a/src/vm-limit.c +++ b/src/vm-limit.c @@ -25,10 +25,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 @@ get_lim_data (void) } #else -#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN) +#if !defined (BSD4_2) && !defined (CYGWIN) #ifdef MSDOS void @@ -148,7 +144,7 @@ get_lim_data (void) } #endif /* not MSDOS */ -#else /* BSD4_2 */ +#else /* BSD4_2 || CYGWIN */ static void get_lim_data (void) |