From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 16 Jul 2008 15:50:45 +0000 (+0000)
Subject: (__ELF__): Consolidate conditions.
X-Git-Tag: emacs-pretest-23.0.90~4133
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4d080b6dabc42a9f2c9a9ef9286707ab2cf394c;p=emacs.git

(__ELF__): Consolidate conditions.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3e85f45ed72..5fbe56b34b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-07-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* m/alpha.h (__ELF__): Consolidate conditions.
+
 	* m/m68k.h (linux): Use GNU_LINUX instead.
 	Remove boilerplate comments.
 
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
 # else
 #  error What gives?  Fix me if DEC Unix supports ELF now.
 # endif
-#endif
 
-#ifdef __ELF__
 #undef UNEXEC
 #define UNEXEC unexelf.o
 #ifndef GNU_LINUX