diff options
| author | Dan Nicolaescu | 2008-07-16 15:50:45 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-07-16 15:50:45 +0000 |
| commit | d4d080b6dabc42a9f2c9a9ef9286707ab2cf394c (patch) | |
| tree | 4b92716ed5ac8e035d092dcec7d5549fa4244f0b /src | |
| parent | 7ab56cc46db5d17076b4b100fe3cf7ebf666fffe (diff) | |
| download | emacs-d4d080b6dabc42a9f2c9a9ef9286707ab2cf394c.tar.gz emacs-d4d080b6dabc42a9f2c9a9ef9286707ab2cf394c.zip | |
(__ELF__): Consolidate conditions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/m/alpha.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3e85f45ed72..5fbe56b34b4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-07-16 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-07-16 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * m/alpha.h (__ELF__): Consolidate conditions. | ||
| 4 | |||
| 3 | * m/m68k.h (linux): Use GNU_LINUX instead. | 5 | * m/m68k.h (linux): Use GNU_LINUX instead. |
| 4 | Remove boilerplate comments. | 6 | Remove boilerplate comments. |
| 5 | 7 | ||
diff --git a/src/m/alpha.h b/src/m/alpha.h index 81863d58b2a..cd023dd1e20 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h | |||
| @@ -89,9 +89,7 @@ NOTE-END | |||
| 89 | # else | 89 | # else |
| 90 | # error What gives? Fix me if DEC Unix supports ELF now. | 90 | # error What gives? Fix me if DEC Unix supports ELF now. |
| 91 | # endif | 91 | # endif |
| 92 | #endif | ||
| 93 | 92 | ||
| 94 | #ifdef __ELF__ | ||
| 95 | #undef UNEXEC | 93 | #undef UNEXEC |
| 96 | #define UNEXEC unexelf.o | 94 | #define UNEXEC unexelf.o |
| 97 | #ifndef GNU_LINUX | 95 | #ifndef GNU_LINUX |