From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Fri, 2 Jul 2010 07:05:09 +0000 (-0700)
Subject: Cleanup old code.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~81^2~66^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=986011195e5c40b9644c21da166c12cb34176350;p=emacs.git

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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a40d0d75c8..45d8bf3fc4f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/dired.c b/src/dired.c
index a3ea23df2f6..c7f4774b991 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -979,10 +979,10 @@ so last access time will always be midnight of that day.  */)
   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 @@ so last access time will always be midnight of that day.  */)
 
   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 @@ so last access time will always be midnight of that day.  */)
     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);
diff --git a/src/mem-limits.h b/src/mem-limits.h
index d811968b13f..16e6b15d922 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -49,15 +49,7 @@ extern int etext, __data_start; weak_extern (__data_start)
 #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 */
diff --git a/src/syssignal.h b/src/syssignal.h
index 9a145b78cb1..71a69dfa413 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -113,9 +113,6 @@ sigset_t sys_sigsetmask P_ ((sigset_t new_mask));
 #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
diff --git a/src/vm-limit.c b/src/vm-limit.c
index a5b07eb50da..1f401601bbf 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -23,13 +23,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 POINTER data_space_start;
 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 @@ get_lim_data ()
 #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. */