Mps: fix w3 builds: integrate from master the following:

MPS: fix Windows build of text-executables needing formats, with new 
make-variable FMTTEST, replacing DWTEST and HETEST, and fixing 
awlut.exe build.  (integrate from version/1.106/...@157962)
   (159467)
MPS: fix w3i3mv "all" build with VC6:
1. amsss.c: initialize ambigRoot (uninitialized warning);
2. commpost.nmk: 
2a. drop long-vanished protcv.exe;
2b. mpmss.exe needs MVFF;
2c. locusss.exe had no build rule;
3. finaltest.c: main does not use argc,v so declare as main(void);
4. lockutw3.c: add parens to avoid operator-precedence warning;
5. protocol.h: s/interface/interfaceIn: suspected compiler bug.
(integrate from version/1.106/...@158054)
   (159468)
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)
   (159469)

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

1 files changed, 4 insertions, 2 deletions

diff --git a/mps/code/protocol.h b/mps/code/protocol.h
index 81f9b9bf511..4c70738e8f8 100644
--- a/mps/code/protocol.h
+++ b/mps/code/protocol.h
@@ -102,20 +102,22 @@ typedef struct ProtocolInstStruct *ProtocolInst;
  * If "pro" is an instance of "interface", then returns TRUE
  * and sets coerceResult to point directly to the part of "pro"
  * which contains the slots for "interface"
+ * RHSK  2006-04-05  s/interface/interfaceIn/: job000605, suspect msvc bug.
  */
 typedef Bool (*ProtocolCoerceInstMethod)(ProtocolInst *coerceResult,
                                          ProtocolInst pro,
-                                         ProtocolClass interface);
+                                         ProtocolClass interfaceIn);
 
 /* ProtocolCoerceClassMethod -- coerce "proClass" to an "interface" class
  *
  * If "proClass" is a subclass of "interface", then returns TRUE
  * and sets coerceResult to point directly to the part of
  * "proClass" which contains the slots for "interface".
+ * RHSK  2006-04-05  s/interface/interfaceIn/: job000605, suspect msvc bug.
  */
 typedef Bool (*ProtocolCoerceClassMethod)(ProtocolClass *coerceResult,
                                           ProtocolClass proClass,
-                                          ProtocolClass interface);
+                                          ProtocolClass interfaceIn);