Ensure the emergency branch compiles and runs on lii6gc:

No need for <string.h> in mpsi.c (this defines a function "index" on Linux).
Need more headers in range.c so that it will compile on its own.
Need UNUSED() declarations for some variables in cbstest.c.

Copied from Perforce
 Change: 182113
 ServerID: perforce.ravenbrook.com

3 files changed, 17 insertions, 1 deletions

diff --git a/mps/code/cbstest.c b/mps/code/cbstest.c
index 3b72e875c28..d4e20df41e8 100644
--- a/mps/code/cbstest.c
+++ b/mps/code/cbstest.c
@@ -225,6 +225,11 @@ static void allocate(CBS cbs, Addr block, BT allocTable,
     left = AddrOffset(outerBase, base);
     right = AddrOffset(limit, outerLimit);
     total = AddrOffset(outerBase, outerLimit);
+
+    /* TODO: check these values */
+    UNUSED(left);
+    UNUSED(right);
+    UNUSED(total);
   }
 
   res = CBSDelete(&oldBase, &oldLimit, cbs, base, limit);
@@ -285,6 +290,11 @@ static void deallocate(CBS cbs, Addr block, BT allocTable,
     left = AddrOffset(outerBase, base);
     right = AddrOffset(limit, outerLimit);
     total = AddrOffset(outerBase, outerLimit);
+
+    /* TODO: check these values */
+    UNUSED(left);
+    UNUSED(right);
+    UNUSED(total);
   }
 
   res = CBSInsert(&freeBase, &freeLimit, cbs, base, limit);
@@ -313,6 +323,7 @@ static void find(CBS cbs, void *block, BT alloc, Size size, Bool high,
   Addr oldBase, oldLimit, origBase, origLimit;
   Size oldSize, newSize;
 
+  origBase = origLimit = NULL;
   expected = (high ? BTFindLongResRangeHigh : BTFindLongResRange)
                (&expectedBase, &expectedLimit, alloc,
                 (Index)0, (Index)ArraySize, (Count)size);
@@ -342,6 +353,10 @@ static void find(CBS cbs, void *block, BT alloc, Size size, Bool high,
     if (findDelete != CBSFindDeleteNONE) {
       newSize = AddrOffset(remainderBase, remainderLimit);
     }
+
+    /* TODO: check these values */
+    UNUSED(oldSize);
+    UNUSED(newSize);
   }
 
   found = (high ? CBSFindLast : CBSFindFirst)
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 746ba3e712d..e89577f9c67 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -53,7 +53,6 @@
 #include "mpsavm.h"
 
 #include <stdarg.h>
-#include <string.h>
 
 
 SRCID(mpsi, "$Id$");
diff --git a/mps/code/range.c b/mps/code/range.c
index c06e6032644..739b11f5b5e 100644
--- a/mps/code/range.c
+++ b/mps/code/range.c
@@ -6,6 +6,8 @@
  * .design: <design/range/>
  */
 
+#include "check.h"
+#include "mpm.h"
 #include "range.h"
 
 SRCID(range, "$Id$");