Mercurial > emacs
changeset 109097:ed7496d92467
Cleanup old code.
* src/dired.c (BSD4_3): Remove all uses, redundant with BSD4_2.
* src/syssignal.h: Remove code for Lynx, not supported anymore.
* src/vm-limit.c: Remove unused code the depends on emacs not being
defined and NO_LIM_DATA being defined.
* src/mem-limits.h: Remove dead code.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 02 Jul 2010 00:05:09 -0700 |
| parents | 43b10f3ac90c |
| children | a17732ef349e |
| files | src/ChangeLog src/dired.c src/mem-limits.h src/syssignal.h src/vm-limit.c |
| diffstat | 5 files changed, 14 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 01 20:09:28 2010 +0200 +++ b/src/ChangeLog Fri Jul 02 00:05:09 2010 -0700 @@ -1,3 +1,12 @@ +2010-07-02 Dan Nicolaescu <dann@ics.uci.edu> + + Cleanup old code. + * dired.c (BSD4_3): Remove all uses, redundant with BSD4_2. + * syssignal.h: Remove code for Lynx, not supported anymore. + * vm-limit.c: Remove unused code the depends on emacs not being + defined and NO_LIM_DATA being defined. + * mem-limits.h: Remove dead code. + 2010-07-01 Jan Djärv <jan.h.d@swipnet.se> * window.c (Fwindow_absolute_pixel_edges): Doc fix.
--- a/src/dired.c Thu Jul 01 20:09:28 2010 +0200 +++ b/src/dired.c Fri Jul 02 00:05:09 2010 -0700 @@ -979,10 +979,10 @@ Lisp_Object values[12]; Lisp_Object encoded; struct stat s; -#if defined (BSD4_2) || defined (BSD4_3) +#ifdef BSD4_2 Lisp_Object dirname; struct stat sdir; -#endif +#endif /* BSD4_2 */ char modes[10]; Lisp_Object handler; struct gcpro gcpro1; @@ -1049,7 +1049,7 @@ filemodestring (&s, modes); values[8] = make_string (modes, 10); -#if defined (BSD4_2) || defined (BSD4_3) /* file gid will be dir gid */ +#ifdef BSD4_2 /* file gid will be dir gid */ dirname = Ffile_name_directory (filename); if (! NILP (dirname)) encoded = ENCODE_FILE (dirname); @@ -1059,7 +1059,7 @@ values[9] = Qt; #else /* file gid will be egid */ values[9] = (s.st_gid != getegid ()) ? Qt : Qnil; -#endif /* BSD4_2 (or BSD4_3) */ +#endif /* not BSD4_2 */ if (!FIXNUM_OVERFLOW_P (s.st_ino)) /* Keep the most common cases as integers. */ values[10] = make_number (s.st_ino);
--- a/src/mem-limits.h Thu Jul 01 20:09:28 2010 +0200 +++ b/src/mem-limits.h Fri Jul 02 00:05:09 2010 -0700 @@ -49,15 +49,7 @@ #define BSD4_2 #endif -#ifndef BSD4_2 -#ifndef USG -#ifndef MSDOS -#ifndef WINDOWSNT -#include <sys/vlimit.h> -#endif /* not WINDOWSNT */ -#endif /* not MSDOS */ -#endif /* not USG */ -#else /* if BSD4_2 */ +#ifdef BSD4_2 #include <sys/time.h> #include <sys/resource.h> #endif /* BSD4_2 */
--- a/src/syssignal.h Thu Jul 01 20:09:28 2010 +0200 +++ b/src/syssignal.h Fri Jul 02 00:05:09 2010 -0700 @@ -113,9 +113,6 @@ #endif #if defined (SIGIO) && defined (BROKEN_SIGIO) # undef SIGIO -# if defined (__Lynx__) -# undef SIGPOLL /* Defined as SIGIO on LynxOS */ -# endif #endif #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL) #undef SIGPOLL
--- a/src/vm-limit.c Thu Jul 01 20:09:28 2010 +0200 +++ b/src/vm-limit.c Fri Jul 02 00:05:09 2010 -0700 @@ -23,13 +23,6 @@ #include "lisp.h" #endif -#ifndef emacs -#include <stddef.h> -typedef size_t SIZE; -typedef void *POINTER; -#define EXCEEDS_LISP_PTR(x) 0 -#endif - #include "mem-limits.h" #ifdef HAVE_GETRLIMIT @@ -58,14 +51,6 @@ static unsigned long lim_data; -#ifdef NO_LIM_DATA -static void -get_lim_data () -{ - lim_data = -1; -} -#else /* not NO_LIM_DATA */ - #if defined (HAVE_GETRLIMIT) && defined (RLIMIT_AS) static void get_lim_data () @@ -181,7 +166,6 @@ #endif /* not WINDOWSNT */ #endif /* not USG */ #endif /* not HAVE_GETRLIMIT */ -#endif /* not NO_LIM_DATA */ /* Verify amount of memory available, complaining if we're near the end. */