Move NOP macro from cmpint.c to cmpgc.h since it is also needed

elsewhere.

diff --git a/v7/src/microcode/cmpgc.h b/v7/src/microcode/cmpgc.h
index a1a9d2f44b28b4da12a00b4c6d45ba33c2a6eaef..9e62335c8241d6078028a154530508a4d35408f2 100644 (file)
--- a/v7/src/microcode/cmpgc.h
+++ b/v7/src/microcode/cmpgc.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/cmpgc.h,v 1.14 1991/03/21 23:25:47 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/cmpgc.h,v 1.15 1991/03/22 06:27:39 jinx Exp $
 
 Copyright (c) 1989-1991 Massachusetts Institute of Technology
 
@@ -44,6 +44,8 @@ See cmpint.txt, cmpint.c, cmpint-md.h, and cmpaux-md.m4 for more details.
 #ifndef CMPGC_H_INCLUDED
 #define CMPGC_H_INCLUDED
 
+#define NOP() do {} while (0) /* A useful macro */
+
 #ifdef HAS_COMPILER_SUPPORT
 
 #include "cmpint2.h"

diff --git a/v7/src/microcode/cmpint.c b/v7/src/microcode/cmpint.c
index 8f092a95fa77c9567407e44b90941eac6f73155c..727c7d089476583e7088b135588dd3487508fb3d 100644 (file)
--- a/v7/src/microcode/cmpint.c
+++ b/v7/src/microcode/cmpint.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/cmpint.c,v 1.32 1991/03/21 23:26:02 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/cmpint.c,v 1.33 1991/03/22 06:27:54 jinx Exp $
 
 Copyright (c) 1989-1991 Massachusetts Institute of Technology
 
@@ -73,8 +73,6 @@ MIT in each case. */
  *
  */
 
-#define NOP() do {} while (0) /* A useful macro */
-
 /* Macro imports */
 
 #include <stdio.h>
@@ -99,7 +97,6 @@ MIT in each case. */
 #include "prims.h"      /* LEXPR */
 #include "prim.h"      /* Primitive_Procedure_Table, etc. */
 #define IN_CMPINT_C
-#include "cmpint2.h"    /* Compiled code object destructuring */
 #include "cmpgc.h"      /* Compiled code object relocation */
 
 #ifndef FLUSH_I_CACHE_REGION

diff --git a/v8/src/microcode/cmpint.c b/v8/src/microcode/cmpint.c
index 64af6c43ea4478a2f78e9f3ff4a04c425fd06bca..837fa842faf87e66dff3b9ef56fceb89a7ec517e 100644 (file)
--- a/v8/src/microcode/cmpint.c
+++ b/v8/src/microcode/cmpint.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/cmpint.c,v 1.32 1991/03/21 23:26:02 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/cmpint.c,v 1.33 1991/03/22 06:27:54 jinx Exp $
 
 Copyright (c) 1989-1991 Massachusetts Institute of Technology
 
@@ -73,8 +73,6 @@ MIT in each case. */
  *
  */
 
-#define NOP() do {} while (0) /* A useful macro */
-
 /* Macro imports */
 
 #include <stdio.h>
@@ -99,7 +97,6 @@ MIT in each case. */
 #include "prims.h"      /* LEXPR */
 #include "prim.h"      /* Primitive_Procedure_Table, etc. */
 #define IN_CMPINT_C
-#include "cmpint2.h"    /* Compiled code object destructuring */
 #include "cmpgc.h"      /* Compiled code object relocation */
 
 #ifndef FLUSH_I_CACHE_REGION