summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-04-06 23:01:30 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-04-06 23:01:30 -0700
commit863bf4810aa40ec9cf7b61b4fc8781ef956b5165 (patch)
treea8cb951fecfa9be7f7727eb8e8584f73b0c7dfde
parent31527c568290029985483745056c92e443451365 (diff)
downloademacs-863bf4810aa40ec9cf7b61b4fc8781ef956b5165.tar.gz
* m/iris4d.h (UNEXEC): Move definition ...
* s/irix6-5.h (UNEXEC): ... here.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/m/iris4d.h6
-rw-r--r--src/s/irix6-5.h2
3 files changed, 7 insertions, 6 deletions
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