From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 7 Apr 2010 06:01:30 +0000 (-0700)
Subject: * m/iris4d.h (UNEXEC): Move definition ...
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~571
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=863bf4810aa40ec9cf7b61b4fc8781ef956b5165;p=emacs.git

* m/iris4d.h (UNEXEC): Move definition ...
* s/irix6-5.h (UNEXEC): ... here.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 218ea86b84b..37d76ab73e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* m/iris4d.h (UNEXEC): Move definition ...
+	* s/irix6-5.h (UNEXEC): ... here.
+
 2010-04-04  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xfns.c (set_machine_and_pid_properties): New function.
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 794227977be..1c276ecb167 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -36,12 +36,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define EXPLICIT_SIGN_EXTEND
 
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#undef UNEXEC
-#define UNEXEC unexelf.o
-
 #define TEXT_START 0x400000
 
 /*
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 8696aa00fdd..0a0b0d4af26 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -82,6 +82,8 @@ char *_getpty();
 /* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
 #define PREFER_VSUSP
 
+#define UNEXEC unexelf.o
+
 /* define MAIL_USE_FLOCK if the mailer uses flock
    to interlock access to /usr/spool/mail/$USER.
    The alternative is that a lock file named