From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 21 Mar 2010 19:59:04 +0000 (-0700)
Subject: (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~691
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0be96e3a14ddf6b5437adf5dc12b6abff44c3652;p=emacs.git

(BSD_SYSTEM, BSD4_2): Remove conditionals, we only
support vax on BSDs.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index dcd4d2e4abc..c65767d8fc4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-03-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* m/vax.h (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
+	support vax on BSDs.
+
 	* m/ibmrs6000.h (ORDINARY_LINK): Move definition ...
 	* s/aix4-2.h (ORDINARY_LINK): ... here.
 
diff --git a/src/m/vax.h b/src/m/vax.h
index fa6cc1b5977..62c78e68ab0 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -38,7 +38,6 @@ NOTE-END  */
 
 #define CRT0_DUMMIES
 
-#ifdef BSD_SYSTEM
 /* USG systems I know of running on Vaxes do not actually
    support the load average, so disable it for them.  */
 
@@ -50,11 +49,7 @@ NOTE-END  */
 
 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
 
-#endif /* BSD_SYSTEM */
-
-#ifdef BSD4_2
 #define HAVE_FTIME
-#endif
 
 /* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
    (do not change this comment) */