[Emacs-diffs] /srv/bzr/emacs/trunk r99714: (BSD_SYSTEM, BSD4_2): Remove conditionals, we only

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99714
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-21 12:59:04 -0700
message:
  (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
  support vax on BSDs.
modified:
  src/ChangeLog
  src/m/vax.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-21 19:32:38 +0000
+++ b/src/ChangeLog     2010-03-21 19:59:04 +0000
@@ -1,5 +1,8 @@
 2010-03-21  Dan Nicolaescu  <address@hidden>
 
+       * 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.
 

=== modified file 'src/m/vax.h'
--- a/src/m/vax.h       2010-01-13 08:35:10 +0000
+++ b/src/m/vax.h       2010-03-21 19:59:04 +0000
@@ -38,7 +38,6 @@
 
 #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 @@
 
 #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) */