diff --git a/ivlpp/globals.h b/ivlpp/globals.h
index 4237201cd..6ebc52b33 100644
--- a/ivlpp/globals.h
+++ b/ivlpp/globals.h
@@ -18,8 +18,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#if !defined(WINNT)
-#ident "$Id: globals.h,v 1.3 2000/06/30 15:49:44 steve Exp $"
+#if !defined(WINNT) && !defined(macintosh)
+#ident "$Id: globals.h,v 1.4 2000/08/20 17:49:04 steve Exp $"
 #endif
 
 # include  <stdio.h>
@@ -42,6 +42,9 @@ extern int yyparse();
 
 /*
  * $Log: globals.h,v $
+ * Revision 1.4  2000/08/20 17:49:04  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.3  2000/06/30 15:49:44  steve
  *  Handle errors from parser slightly differently.
  *
diff --git a/ivlpp/lexor.lex b/ivlpp/lexor.lex
index 7d96201ce..a8ff12e20 100644
--- a/ivlpp/lexor.lex
+++ b/ivlpp/lexor.lex
@@ -18,8 +18,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#if !defined(WINNT)
-#ident "$Id: lexor.lex,v 1.19 2000/08/01 01:38:25 steve Exp $"
+#if !defined(WINNT) && !defined(macintosh)
+#ident "$Id: lexor.lex,v 1.20 2000/08/20 17:49:04 steve Exp $"
 #endif
 
 # include  <stdio.h>
diff --git a/ivlpp/main.c b/ivlpp/main.c
index 9c016dc58..f55763d6a 100644
--- a/ivlpp/main.c
+++ b/ivlpp/main.c
@@ -16,8 +16,8 @@ const char COPYRIGHT[] =
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#if !defined(WINNT)
-#ident "$Id: main.c,v 1.5 2000/06/30 15:49:44 steve Exp $"
+#if !defined(WINNT) && !defined(macintosh)
+#ident "$Id: main.c,v 1.6 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 const char NOTICE[] =
@@ -148,6 +148,9 @@ int main(int argc, char*argv[])
 
 /*
  * $Log: main.c,v $
+ * Revision 1.6  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.5  2000/06/30 15:49:44  steve
  *  Handle errors from parser slightly differently.
  *
diff --git a/ivlpp/parse.y b/ivlpp/parse.y
index dbf71d0d4..9b26afaa3 100644
--- a/ivlpp/parse.y
+++ b/ivlpp/parse.y
@@ -18,8 +18,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#if !defined(WINNT)
-#ident "$Id: parse.y,v 1.1 1999/07/03 17:24:11 steve Exp $"
+#if !defined(WINNT) && !defined(macintosh)
+#ident "$Id: parse.y,v 1.2 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 static void yyerror(const char*msg);
diff --git a/t-vvm.cc b/t-vvm.cc
index 5011c2153..43e099eba 100644
--- a/t-vvm.cc
+++ b/t-vvm.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: t-vvm.cc,v 1.168 2000/08/14 04:39:57 steve Exp $"
+#ident "$Id: t-vvm.cc,v 1.169 2000/08/20 17:49:04 steve Exp $"
 #endif
 
 # include  <iostream>
@@ -34,7 +34,7 @@
   // Comparison for use in sorting algorithms.
 
 struct less_verinum {
-      bool operator() (const verinum&left, const verinum&right)
+      bool operator() (const verinum&left, const verinum&right) const
 	    { return left.is_before(right); }
 };
 
@@ -3117,6 +3117,9 @@ extern const struct target tgt_vvm = {
 };
 /*
  * $Log: t-vvm.cc,v $
+ * Revision 1.169  2000/08/20 17:49:04  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.168  2000/08/14 04:39:57  steve
  *  add th t-dll functions for net_const, net_bufz and processes.
  *
diff --git a/vpi/sys_display.c b/vpi/sys_display.c
index d0acd313c..1baa099cf 100644
--- a/vpi/sys_display.c
+++ b/vpi/sys_display.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: sys_display.c,v 1.16 2000/05/31 02:15:43 steve Exp $"
+#ident "$Id: sys_display.c,v 1.17 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  "vpi_user.h"
@@ -571,13 +571,14 @@ void sys_display_register()
       tf_data.sizetf    = 0;
       tf_data.user_data = "$fwrite";
       vpi_register_systf(&tf_data);
-
-      vpi_mcd_init();
 }
 
 
 /*
  * $Log: sys_display.c,v $
+ * Revision 1.17  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.16  2000/05/31 02:15:43  steve
  *  typo: fix vpiReadVal to vpiRealVal
  *
diff --git a/vpi/sys_readmem_lex.h b/vpi/sys_readmem_lex.h
index 39667685b..f5980bc55 100644
--- a/vpi/sys_readmem_lex.h
+++ b/vpi/sys_readmem_lex.h
@@ -18,8 +18,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#if !defined(WINNT)
-#ident "$Id: sys_readmem_lex.h,v 1.2 2000/01/23 23:54:36 steve Exp $"
+#if !defined(WINNT) && !defined(macintosh)
+#ident "$Id: sys_readmem_lex.h,v 1.3 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  <stdio.h>
@@ -34,6 +34,9 @@ extern int readmemlex();
 
 /*
  * $Log: sys_readmem_lex.h,v $
+ * Revision 1.3  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.2  2000/01/23 23:54:36  steve
  *  Compile time problems with vpi_user.h
  *
diff --git a/vvm/vpi_callback.c b/vvm/vpi_callback.c
index 1b47a5778..5ea9049ee 100644
--- a/vvm/vpi_callback.c
+++ b/vvm/vpi_callback.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_callback.c,v 1.7 2000/03/31 07:08:39 steve Exp $"
+#ident "$Id: vpi_callback.c,v 1.8 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  "vpi_priv.h"
@@ -47,7 +47,7 @@ static void vpip_call_callback(void*cp)
 
       switch (rfp->cb_data.time->type) {
 	  case vpiSuppressTime:
-	  case vpiScaledRealTime: // XXXX not supported
+	  case vpiScaledRealTime: /* XXXX not supported */
 	    break;
 
 	  case vpiSimTime:
@@ -191,6 +191,9 @@ int vpi_remove_cb(vpiHandle ref)
 
 /*
  * $Log: vpi_callback.c,v $
+ * Revision 1.8  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.7  2000/03/31 07:08:39  steve
  *  allow cancelling of cbValueChange events.
  *
diff --git a/vvm/vpi_const.c b/vvm/vpi_const.c
index 09ec3d78a..88b24fea2 100644
--- a/vvm/vpi_const.c
+++ b/vvm/vpi_const.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_const.c,v 1.11 2000/08/08 01:47:40 steve Exp $"
+#ident "$Id: vpi_const.c,v 1.12 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  "vpi_priv.h"
@@ -30,7 +30,7 @@
  * This function is used in a couple places to interpret a bit string
  * as a value.
  */
-void vpip_bits_get_value(vpip_bit_t*bits, unsigned nbits, s_vpi_value*vp)
+void vpip_bits_get_value(const vpip_bit_t*bits, unsigned nbits, s_vpi_value*vp)
 {
       static char buff[1024];
       static s_vpi_vecval vect[64];
@@ -322,7 +322,7 @@ static void string_value(vpiHandle ref, p_vpi_value vp)
       switch (vp->format) {
 	  case vpiObjTypeVal:
 	  case vpiStringVal:
-	    vp->value.str = rfp->value;
+	    vp->value.str = (char*)rfp->value;
 	    vp->format = vpiStringVal;
 	    break;
 
@@ -393,6 +393,9 @@ vpiHandle vpip_make_number_const(struct __vpiNumberConst*ref,
 
 /*
  * $Log: vpi_const.c,v $
+ * Revision 1.12  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.11  2000/08/08 01:47:40  steve
  *  Add vpi_vlog_info support from Adrian
  *
diff --git a/vvm/vpi_mcd.c b/vvm/vpi_mcd.c
index c7b3d5568..3f20f465d 100644
--- a/vvm/vpi_mcd.c
+++ b/vvm/vpi_mcd.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_mcd.c,v 1.1 2000/05/07 18:20:08 steve Exp $"
+#ident "$Id: vpi_mcd.c,v 1.2 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  "vpi_priv.h"
@@ -37,7 +37,7 @@ static struct mcd_entry mcd_table[32];
 /* Initialize mcd portion of vpi.  Must be called before
  * any vpi_mcd routines can be used.
  */
-void vpi_mcd_init()
+void vpi_mcd_init(void)
 {
 	mcd_table[0].fp = stdout;
 	mcd_table[0].filename = "<stdout>";
diff --git a/vvm/vpi_priv.c b/vvm/vpi_priv.c
index 701ed4459..00aee1dd1 100644
--- a/vvm/vpi_priv.c
+++ b/vvm/vpi_priv.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_priv.c,v 1.8 2000/07/26 03:53:12 steve Exp $"
+#ident "$Id: vpi_priv.c,v 1.9 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  "vpi_priv.h"
@@ -44,7 +44,6 @@ static struct systf_entry*systf_task_list = 0;
 /* This is the handle of the task currently being called. */
 static struct __vpiSysTaskCall*vpip_cur_task;
 
-
 void vpip_calltask(const char*fname, unsigned nparms, vpiHandle*parms)
 {
       struct systf_entry*idx;
@@ -234,6 +233,9 @@ void vpi_register_systf(const struct t_vpi_systf_data*systf)
 
 /*
  * $Log: vpi_priv.c,v $
+ * Revision 1.9  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.8  2000/07/26 03:53:12  steve
  *  Make simulation precision available to VPI.
  *
diff --git a/vvm/vpi_priv.h b/vvm/vpi_priv.h
index 912770e0c..bb6393e04 100644
--- a/vvm/vpi_priv.h
+++ b/vvm/vpi_priv.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_priv.h,v 1.22 2000/07/26 03:53:12 steve Exp $"
+#ident "$Id: vpi_priv.h,v 1.23 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 /*
@@ -111,7 +111,7 @@ extern vpip_bit_t vpip_pair_resolve(vpip_bit_t a, vpip_bit_t b);
 extern vpip_bit_t vpip_bits_resolve(const vpip_bit_t*bits, unsigned nbits);
 
 
-extern void vpip_bits_get_value(vpip_bit_t*bits, unsigned nbits,
+extern void vpip_bits_get_value(const vpip_bit_t*bits, unsigned nbits,
 				s_vpi_value*vp);
 extern void vpip_bits_set_value(vpip_bit_t*bits, unsigned nbits,
 				s_vpi_value*vp);
@@ -282,7 +282,7 @@ struct __vpiStringConst {
 struct __vpiNumberConst {
       struct __vpiHandle base;
 
-      vpip_bit_t*bits;
+      const vpip_bit_t*bits;
       unsigned nbits;
 };
 
@@ -351,6 +351,7 @@ extern struct vpip_simulation vpip_simulation_obj;
 extern void vpip_init_simulation();
 extern void vpip_time_scale(int precision);
 extern void vpip_simulation_run();
+extern void vpi_mcd_init(void);
 
 /*
  * Schedule an event to be run sometime in the future. The d parmater
@@ -384,6 +385,9 @@ extern int vpip_finished();
 
 /*
  * $Log: vpi_priv.h,v $
+ * Revision 1.23  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.22  2000/07/26 03:53:12  steve
  *  Make simulation precision available to VPI.
  *
diff --git a/vvm/vpi_signal.c b/vvm/vpi_signal.c
index 0d642036e..3b463186e 100644
--- a/vvm/vpi_signal.c
+++ b/vvm/vpi_signal.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_signal.c,v 1.10 2000/05/18 03:27:32 steve Exp $"
+#ident "$Id: vpi_signal.c,v 1.11 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  "vpi_priv.h"
@@ -65,7 +65,7 @@ static void signal_get_value(vpiHandle ref, s_vpi_value*vp)
       vpip_bits_get_value(rfp->bits, rfp->nbits, vp);
 }
 
-static void signal_put_value(vpiHandle ref, s_vpi_value*vp,
+static vpiHandle signal_put_value(vpiHandle ref, s_vpi_value*vp,
 			     p_vpi_time when, int flags)
 {
       struct __vpiSignal*rfp = (struct __vpiSignal*)ref;
@@ -73,6 +73,7 @@ static void signal_put_value(vpiHandle ref, s_vpi_value*vp,
 	     || (ref->vpi_type->type_code==vpiReg));
 
       vpip_bits_set_value(rfp->bits, rfp->nbits, vp);
+      return ref;
 }
 
 static const struct __vpirt vpip_net_rt = {
@@ -121,6 +122,9 @@ vpiHandle vpip_make_reg(struct __vpiSignal*ref, const char*name,
 
 /*
  * $Log: vpi_signal.c,v $
+ * Revision 1.11  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.10  2000/05/18 03:27:32  steve
  *  Support writing scalars and vectors to signals.
  *
diff --git a/vvm/vpi_simulation.c b/vvm/vpi_simulation.c
index 3e6125392..e8e4a3a2e 100644
--- a/vvm/vpi_simulation.c
+++ b/vvm/vpi_simulation.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_simulation.c,v 1.3 2000/07/26 03:53:12 steve Exp $"
+#ident "$Id: vpi_simulation.c,v 1.4 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 # include  "vpi_priv.h"
@@ -71,6 +71,8 @@ void vpip_init_simulation()
       cur->next = cur->prev = cur;
       vpip_simulation_obj.sim = cur;
       vpip_simulation_obj.time_precision = 0;
+
+      vpi_mcd_init();
 }
 
 void vpip_time_scale(int precision)
@@ -201,6 +203,9 @@ void vpip_simulation_run()
 
 /*
  * $Log: vpi_simulation.c,v $
+ * Revision 1.4  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.3  2000/07/26 03:53:12  steve
  *  Make simulation precision available to VPI.
  *
diff --git a/vvm/vvm_imod.cc b/vvm/vvm_imod.cc
index de76164bf..58660b5c5 100644
--- a/vvm/vvm_imod.cc
+++ b/vvm/vvm_imod.cc
@@ -16,8 +16,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#if !defined(WINNT) && !defined(WINNT)
-#ident "$Id: vvm_imod.cc,v 1.1 2000/05/19 04:22:56 steve Exp $"
+#if !defined(WINNT) && !defined(macintosh)
+#ident "$Id: vvm_imod.cc,v 1.2 2000/08/20 17:49:05 steve Exp $"
 #endif
 
 
@@ -77,6 +77,9 @@ void vvm_binop_imod(vvm_bitset_t&v, const vvm_bitset_t&l, const vvm_bitset_t&r)
 
 /*
  * $Log: vvm_imod.cc,v $
+ * Revision 1.2  2000/08/20 17:49:05  steve
+ *  Clean up warnings and portability issues.
+ *
  * Revision 1.1  2000/05/19 04:22:56  steve
  *  Add the integer modulus function.
  *