summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1992-02-11 02:09:48 +0000
committerJim Blandy <jimb@redhat.com>1992-02-11 02:09:48 +0000
commitb5752bd1090d9cce79713c1c5847f4dc32291bba (patch)
treec7fa510f33d01cd015b4de04ed42a0c7a603d1af
parent62ae71c2e8a3e53b1b06aed0e7e8a7ffbef88979 (diff)
downloademacs-b5752bd1090d9cce79713c1c5847f4dc32291bba.tar.gz
*** empty log message ***
-rw-r--r--etc/MACHINES5
-rw-r--r--src/callproc.c3
-rw-r--r--src/s/hpux.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/MACHINES b/etc/MACHINES
index 377872976fe..b35ab170b99 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -434,7 +434,10 @@ Intel 386 (-machine=intel386 or -machine=is386;
18.58 should support a wide variety of operating systems.
Use -opsystem=isc2-2 for Interactive 386/ix version 2.2.
Use -opsystem=386ix for prior versions.
- Use -opsystem=esix for Esix. It isn't clear what to do on an SCO system.
+ Use -opsystem=esix for Esix.
+ It isn't clear what to do on an SCO system. The system's C
+ preprocessor doesn't seem to handle the src subdirectory's Make
+ trickery, so you will probably need to install the GNU C preprocessor.
If you are using Xenix, see notes above under Xenix.
diff --git a/src/callproc.c b/src/callproc.c
index e9374aabe13..cc2c2d7b576 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -247,6 +247,9 @@ If you quit, the process is killed with SIGKILL.")
return Qnil;
}
+ synch_process_death = 0;
+ synch_process_retcode = 0;
+
record_unwind_protect (call_process_cleanup,
Fcons (make_number (fd[0]), make_number (pid)));
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 5920a1c2180..33de0875602 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -133,7 +133,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
so that Emacs can tell instantly when you try to modify
a file that someone else has modified in his Emacs. */
-/* #define CLASH_DETECTION */
+#define CLASH_DETECTION
/* Define SHORTNAMES if the C compiler can distinguish only
short names. It means that the stuff in ../shortnames