diff options
| author | Dan Nicolaescu | 2010-03-21 12:59:04 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-03-21 12:59:04 -0700 |
| commit | 0be96e3a14ddf6b5437adf5dc12b6abff44c3652 (patch) | |
| tree | 7c98d710b7f148dbe798d857dc9ca851ed6a1fd3 /src | |
| parent | 55da5ee3387a587a67d50cfbb8aed4f830e2ed78 (diff) | |
| download | emacs-0be96e3a14ddf6b5437adf5dc12b6abff44c3652.tar.gz emacs-0be96e3a14ddf6b5437adf5dc12b6abff44c3652.zip | |
(BSD_SYSTEM, BSD4_2): Remove conditionals, we only
support vax on BSDs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/m/vax.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dcd4d2e4abc..c65767d8fc4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-03-21 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-03-21 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * m/vax.h (BSD_SYSTEM, BSD4_2): Remove conditionals, we only | ||
| 4 | support vax on BSDs. | ||
| 5 | |||
| 3 | * m/ibmrs6000.h (ORDINARY_LINK): Move definition ... | 6 | * m/ibmrs6000.h (ORDINARY_LINK): Move definition ... |
| 4 | * s/aix4-2.h (ORDINARY_LINK): ... here. | 7 | * s/aix4-2.h (ORDINARY_LINK): ... here. |
| 5 | 8 | ||
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 */ | |||
| 38 | 38 | ||
| 39 | #define CRT0_DUMMIES | 39 | #define CRT0_DUMMIES |
| 40 | 40 | ||
| 41 | #ifdef BSD_SYSTEM | ||
| 42 | /* USG systems I know of running on Vaxes do not actually | 41 | /* USG systems I know of running on Vaxes do not actually |
| 43 | support the load average, so disable it for them. */ | 42 | support the load average, so disable it for them. */ |
| 44 | 43 | ||
| @@ -50,11 +49,7 @@ NOTE-END */ | |||
| 50 | 49 | ||
| 51 | #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) | 50 | #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) |
| 52 | 51 | ||
| 53 | #endif /* BSD_SYSTEM */ | ||
| 54 | |||
| 55 | #ifdef BSD4_2 | ||
| 56 | #define HAVE_FTIME | 52 | #define HAVE_FTIME |
| 57 | #endif | ||
| 58 | 53 | ||
| 59 | /* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0 | 54 | /* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0 |
| 60 | (do not change this comment) */ | 55 | (do not change this comment) */ |