From 282d93dde0fdbf1c3520cfba6fa66fafaec0e5a3 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Thu, 27 Sep 1990 17:01:01 +0000
Subject: [PATCH] Fixed problems with -I and with value conformant arrays

---
 lang/m2/comp/options.c | 4 ++--
 lang/m2/comp/program.g | 4 +++-
 lang/m2/comp/stab.c    | 4 +++-
 lang/m2/comp/walk.c    | 5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lang/m2/comp/options.c b/lang/m2/comp/options.c
index d45e8b52c..453ff23b7 100644
--- a/lang/m2/comp/options.c
+++ b/lang/m2/comp/options.c
@@ -140,10 +140,10 @@ DoOption(text)
 				  Realloc(DEFPATH,(mDEF+=10)*sizeof(char *));
 			}
 
-			for (i = ndirs++; i <= nDEF; i++) {
+			for (i = ndirs++; i < nDEF; i++) {
 				char *tmp = DEFPATH[i];
 	
-				DEFPATH[i++] = new;
+				DEFPATH[i] = new;
 				new = tmp;
 			}
 		}
diff --git a/lang/m2/comp/program.g b/lang/m2/comp/program.g
index 96ca2fc1e..44c19ef54 100644
--- a/lang/m2/comp/program.g
+++ b/lang/m2/comp/program.g
@@ -13,7 +13,9 @@
 #include	"debug.h"
 
 #include	<alloc.h>
-#include	<em.h>
+#include	<em_arith.h>
+#include	<em_label.h>
+#include	<em_code.h>
 #include	<stb.h>
 
 #include	"strict3rd.h"
diff --git a/lang/m2/comp/stab.c b/lang/m2/comp/stab.c
index deca994a1..aad9a0ade 100644
--- a/lang/m2/comp/stab.c
+++ b/lang/m2/comp/stab.c
@@ -10,7 +10,9 @@
 /* $Header$ */
 
 #include	<alloc.h>
-#include	<em.h>
+#include	<em_arith.h>
+#include	<em_label.h>
+#include	<em_code.h>
 #include	<flt_arith.h>
 #include	<stb.h>
 
diff --git a/lang/m2/comp/walk.c b/lang/m2/comp/walk.c
index 8eb4c975e..1f7a87b5b 100644
--- a/lang/m2/comp/walk.c
+++ b/lang/m2/comp/walk.c
@@ -354,7 +354,10 @@ WalkProcedure(procedure)
 				}
 				continue;
 			}
-			if (param->par_def->df_flags & D_DEFINED) {
+#ifdef PASS_BIG_VAL_AS_VAR
+			if (param->par_def->df_flags & D_DEFINED)
+#endif
+			{
 				/* Here, we have to make a copy of the
 				   array. We must also remember how much
 				   room is reserved for copies, because
-- 
2.34.1