From 4fd7747338880217b07b68798175d2c95bc64c5e Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 4 Sep 1991 15:49:34 +0000
Subject: [PATCH] fix machine-dependant #if's

---
 lang/m2/libm2/catch.c  | 6 +-----
 lang/m2/libm2/init.c   | 2 +-
 lang/m2/libm2/sigtrp.c | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lang/m2/libm2/catch.c b/lang/m2/libm2/catch.c
index 7ee5451d6..378bac1cc 100644
--- a/lang/m2/libm2/catch.c
+++ b/lang/m2/libm2/catch.c
@@ -82,9 +82,7 @@ catch(trapno)
 		*p = 0;
 		_Traps__Message(q, 0, (int) (p - q), 1);
 	}
-#ifndef em24
-#ifndef em44
-#ifndef em22
+#if !defined(__em24) && !defined(__em44) && !defined(__em22)
 	if (trapno == M2_UNIXSIG) {
 		extern int __signo;
 		signal(__signo, SIG_DFL);
@@ -92,8 +90,6 @@ catch(trapno)
 		kill(getpid(), __signo);
 		_exit(trapno);
 	}
-#endif
-#endif
 #endif
 	if (trapno != M2_FORCH) {
 		_cleanup();
diff --git a/lang/m2/libm2/init.c b/lang/m2/libm2/init.c
index 0192487c3..8f1bbd0df 100644
--- a/lang/m2/libm2/init.c
+++ b/lang/m2/libm2/init.c
@@ -31,7 +31,7 @@ init()
 	sigtrp(M2_UNIXSIG, SIGALRM);
 	sigtrp(M2_UNIXSIG, SIGTERM);
 }
-#if em22 || em24 || em44
+#if defined(__em22) || defined(__em24) || defined(__em44)
 killbss()
 {
 }
diff --git a/lang/m2/libm2/sigtrp.c b/lang/m2/libm2/sigtrp.c
index c01612555..202064be2 100644
--- a/lang/m2/libm2/sigtrp.c
+++ b/lang/m2/libm2/sigtrp.c
@@ -10,9 +10,7 @@
   Version:	$Header$
 */
 
-#ifndef em22
-#ifndef em24
-#ifndef em44
+#if !defined(__em22) && !defined(__em24) && !defined(__em44)
 
 #define EM_trap(n) TRP(n)	/* define to whatever is needed to cause the trap */
 
@@ -82,5 +80,3 @@ sigtrp(trapno, signo)
 	return oldtrap;
 }
 #endif
-#endif
-#endif