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.

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

5 files changed, 15 insertions, 11 deletions

diff --git a/mps/code/amsss.c b/mps/code/amsss.c
index 9c878a1934a..fa42abc2f05 100644
--- a/mps/code/amsss.c
+++ b/mps/code/amsss.c
@@ -74,7 +74,7 @@ static mps_pool_debug_option_s freecheckOptions =
 static void *test(void *arg, size_t haveAmbigous)
 {
   mps_pool_t pool;
-  mps_root_t exactRoot, ambigRoot;
+  mps_root_t exactRoot, ambigRoot = NULL;
   size_t lastStep = 0, i, r;
   unsigned long objs;
   mps_ap_t busy_ap;
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 8383548b710..36d34d41535 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -16,7 +16,7 @@
 
 all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe\
      mpsicv.exe lockutw3.exe lockcov.exe poolncv.exe locv.exe qs.exe apss.exe \
-     finalcv.exe finaltest.exe arenacv.exe bttest.exe teletest.exe protcv.exe \
+     finalcv.exe finaltest.exe arenacv.exe bttest.exe teletest.exe \
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
      locbwcss.exe locusss.exe \
      eventcnv.exe
@@ -31,7 +31,7 @@ swall: mmsw.lib replaysw.exe
 
 mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe dwstress.exe \
      mpsicv.exe lockutw3.exe lockcov.exe poolncv.exe locv.exe qs.exe apss.exe \
-     finalcv.exe finaltest.exe arenacv.exe bttest.exe teletest.exe protcv.exe \
+     finalcv.exe finaltest.exe arenacv.exe bttest.exe teletest.exe \
      expt825.exe \
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
      walkt0.exe locbwcss.exe locusss.exe \
@@ -122,6 +122,7 @@ $(PFM)\$(VARIETY)\locv.exe:  $(PFM)\$(VARIETY)\locv.obj \
         $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ)
 
 $(PFM)\$(VARIETY)\mpmss.exe: $(PFM)\$(VARIETY)\mpmss.obj \
+        $(PFM)\$(VARIETY)\poolmvff.obj \
         $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\apss.exe: $(PFM)\$(VARIETY)\apss.obj \
@@ -140,9 +141,6 @@ $(PFM)\$(VARIETY)\lockcov.exe: $(PFM)\$(VARIETY)\lockcov.obj \
 $(PFM)\$(VARIETY)\lockutw3.exe: $(PFM)\$(VARIETY)\lockutw3.obj \
         $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
-$(PFM)\$(VARIETY)\protcv.exe:  $(PFM)\$(VARIETY)\protcv.obj \
-        $(MPMOBJ) $(PLINTHOBJ)
-
 $(PFM)\$(VARIETY)\mpsicv.exe: $(PFM)\$(VARIETY)\mpsicv.obj \
         $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
         $(TESTLIBOBJ)
@@ -171,6 +169,10 @@ $(PFM)\$(VARIETY)\locbwcss.exe: $(PFM)\$(VARIETY)\locbwcss.obj \
         $(PFM)\$(VARIETY)\poolmvff.obj \
         $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
 
+$(PFM)\$(VARIETY)\locusss.exe: $(PFM)\$(VARIETY)\locusss.obj \
+        $(PFM)\$(VARIETY)\poolmvff.obj \
+        $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+
 $(PFM)\$(VARIETY)\dwstress.exe:  $(PFM)\$(VARIETY)\dwstress.obj \
         $(DWOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ)
 
diff --git a/mps/code/finaltest.c b/mps/code/finaltest.c
index bdfdda4be85..24a6e81b9eb 100644
--- a/mps/code/finaltest.c
+++ b/mps/code/finaltest.c
@@ -241,7 +241,7 @@ static void *test(void *arg, size_t s)
 }
 
 
-int main(int argc, char **argv)
+int main(void)
 {
   mps_arena_t arena;
   mps_thr_t thread;
diff --git a/mps/code/lockutw3.c b/mps/code/lockutw3.c
index 5b29b3fd450..2565ec60796 100644
--- a/mps/code/lockutw3.c
+++ b/mps/code/lockutw3.c
@@ -31,7 +31,7 @@ void incR(unsigned long i)
     }
   } else {
     incR(i >> 1);
-    incR(i+1 >> 1);
+    incR( (i+1) >> 1);
   }
   LockReleaseRecursive(lock);
 }
@@ -39,7 +39,7 @@ void incR(unsigned long i)
 
 void inc(unsigned long i)
 {
-  incR(i+1>>1);
+  incR( (i+1) >>1);
   i >>= 1;
   while (i) {
     LockClaim(lock);
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);