Mps: attempt to fix w3i3mv "all" build with vc7:

(unknown if these changes are effective, but they should be safe)
1. mpm.c: +1 to array size to make room for terminator of string initializer;
2. testlib.c: disable warning 4702: unreachable code, for va_end.
(integrate from version/1.106/...@158055)

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

2 files changed, 12 insertions, 1 deletions

diff --git a/mps/code/mpm.c b/mps/code/mpm.c
index 0930be4c6d3..247cbd05a56 100644
--- a/mps/code/mpm.c
+++ b/mps/code/mpm.c
@@ -226,7 +226,8 @@ Bool ResIsAllocFailure(Res res)
 static Res WriteWord(mps_lib_FILE *stream, Word w, unsigned base,
                      unsigned width)
 {
-  static const char digit[16] = "0123456789ABCDEF";
+  static const char digit[16 + 1] = "0123456789ABCDEF";
+    /* + 1 for terminator: unused, but prevents compiler warning */
   static const char pad = '0'; /* padding character */
   char buf[MPS_WORD_WIDTH + 1]; /* enough for binary, */
                                 /* plus one for terminator */
diff --git a/mps/code/testlib.c b/mps/code/testlib.c
index 7010d2484d8..8cf36491cd3 100644
--- a/mps/code/testlib.c
+++ b/mps/code/testlib.c
@@ -18,6 +18,16 @@ struct itimerspec; /* stop complaints from time.h */
 #endif
 #include <time.h>
 
+#ifdef MPS_OS_W3
+#ifdef _MSC_VER
+#pragma warning(disable: 4702)  /* unreachable code */
+ /* job000605: believed needed to prevent VC7 warning 
+  * for error() below, in which va_end is mandated by 
+  * ISO C (C99:7.15.1) even though it is unreachable.
+  */
+#endif
+#endif
+
 
 /* rnd -- a random number generator
  *