1.1 --- a/VMS.c	Sat Nov 20 08:19:05 2010 +0100
     1.2 +++ b/VMS.c	Wed May 11 16:13:24 2011 +0200
     1.3 @@ -118,7 +118,7 @@
     1.4     //========================================================================
     1.5  
     1.6     //===================== Only VMS__malloc after this ====================
     1.7 -   masterEnv     = _VMSMasterEnv;
     1.8 +   masterEnv     = (MasterEnv*)_VMSMasterEnv;
     1.9     
    1.10        //Make a readyToAnimateQ for each core loop
    1.11     readyToAnimateQs = VMS__malloc( NUM_CORES * sizeof(VMSQueueStruc *) );
    1.12 @@ -153,7 +153,7 @@
    1.13     //============================= MEASUREMENT STUFF ========================
    1.14     #ifdef STATS__TURN_ON_PROBES
    1.15     _VMSMasterEnv->dynIntervalProbesInfo =
    1.16 -              makePrivDynArrayOfSize( &(_VMSMasterEnv->intervalProbes), 200);
    1.17 +              makePrivDynArrayOfSize( (void***)&(_VMSMasterEnv->intervalProbes), 200);
    1.18  
    1.19     _VMSMasterEnv->probeNameHashTbl = makeHashTable( 1000, &VMS__free );
    1.20     
    1.21 @@ -767,7 +767,7 @@
    1.22     SchedSlot     ***allSchedSlots; //ptr to array of ptrs
    1.23  
    1.24        //Before getting rid of everything, print out any measurements made
    1.25 -   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &printHist );
    1.26 +   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
    1.27     //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHistExt );
    1.28     #ifdef MEAS__TIME_PLUGIN
    1.29     printHist( _VMSMasterEnv->reqHdlrLowTimeHist );
    1.30 @@ -849,7 +849,7 @@
    1.31  void
    1.32  VMS__throw_exception( char *msgStr, VirtProcr *reqstPr, VMSExcp *excpData )
    1.33   {
    1.34 -   printf(msgStr);
    1.35 +   printf("%s",msgStr);
    1.36     fflush(stdin);
    1.37     exit(1);
    1.38   }