1.1 --- a/DynArray.c	Tue Mar 13 18:31:05 2012 -0700
     1.2 +++ b/DynArray.c	Mon Sep 03 15:02:35 2012 -0700
     1.3 @@ -19,7 +19,7 @@
     1.4  makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray )
     1.5   { PrivDynArrayInfo *info;
     1.6  
     1.7 -   info = VMS_int__malloc( sizeof(PrivDynArrayInfo) );
     1.8 +   info = PR_int__malloc( sizeof(PrivDynArrayInfo) );
     1.9  
    1.10     info->addrOfPtrToArray = addrOfPtrToArray;
    1.11     info->sizeOfArray      = sizeOfArray;
    1.12 @@ -31,11 +31,11 @@
    1.13  makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray )
    1.14   { PrivDynArrayInfo *info;
    1.15  
    1.16 -   info = VMS_int__malloc( sizeof(PrivDynArrayInfo) );
    1.17 +   info = PR_int__malloc( sizeof(PrivDynArrayInfo) );
    1.18  
    1.19     info->addrOfPtrToArray = addrOfPtrToArray;
    1.20  
    1.21 -   *(addrOfPtrToArray)    = VMS_int__malloc( sizeOfArray * sizeof(void *) );
    1.22 +   *(addrOfPtrToArray)    = PR_int__malloc( sizeOfArray * sizeof(void *) );
    1.23     info->sizeOfArray      = sizeOfArray;
    1.24     info->numInArray       = 0;
    1.25     return info;
    1.26 @@ -139,7 +139,7 @@
    1.27     if( newSize <= oldSizeOfArray ) return;
    1.28  
    1.29     oldArray         = *(info->addrOfPtrToArray);
    1.30 -   newArray         = VMS_int__malloc( newSize * sizeof(void *) );
    1.31 +   newArray         = PR_int__malloc( newSize * sizeof(void *) );
    1.32  
    1.33     for( i = 0; i < oldSizeOfArray; i++ )
    1.34      {
    1.35 @@ -148,11 +148,11 @@
    1.36     *(info->addrOfPtrToArray) = newArray; //change location of array-ptr
    1.37     info->sizeOfArray = newSize;
    1.38  
    1.39 -   VMS_int__free( oldArray );
    1.40 +   PR_int__free( oldArray );
    1.41   }
    1.42  
    1.43 -/*Can't mix VMS_int__malloc locations with external malloc locations -- so use
    1.44 - * this version inside VMS, which will perform normal malloc in the core
    1.45 +/*Can't mix PR_int__malloc locations with external malloc locations -- so use
    1.46 + * this version inside PR, which will perform normal malloc in the core
    1.47   * loop -- hopefully avoiding the annoying system-stack bugs..
    1.48   */
    1.49  void
    1.50 @@ -183,8 +183,8 @@
    1.51  freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr )
    1.52   {
    1.53     forAllInDynArrayDo( info, freeFnPtr );
    1.54 -   VMS_int__free( *(info->addrOfPtrToArray) );
    1.55 -   VMS_int__free( info );
    1.56 +   PR_int__free( *(info->addrOfPtrToArray) );
    1.57 +   PR_int__free( info );
    1.58   }
    1.59  
    1.60  /* Only frees the info
    1.61 @@ -192,7 +192,7 @@
    1.62  void
    1.63  freeDynArrayFlat( PrivDynArrayInfo *info )
    1.64   {
    1.65 -   VMS_int__free( info );
    1.66 +   PR_int__free( info );
    1.67   }
    1.68  
    1.69  

     2.1 --- a/DynArray.h	Tue Mar 13 18:31:05 2012 -0700
     2.2 +++ b/DynArray.h	Mon Sep 03 15:02:35 2012 -0700
     2.3 @@ -8,8 +8,8 @@
     2.4  #ifndef _DYNARRAY_H
     2.5  #define	_DYNARRAY_H
     2.6  
     2.7 -#include "VMS_impl/VMS_primitive_data_types.h"
     2.8 -#include "VMS_impl/Services_Offered_by_VMS/Memory_Handling/vmalloc.h"
     2.9 +#include "PR_impl/PR_primitive_data_types.h"
    2.10 +#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h"
    2.11  
    2.12  
    2.13     //A dynamic array is same as any other array, but add a DynArrayInfo next

     3.1 --- a/__brch__MC_shared	Tue Mar 13 18:31:05 2012 -0700
     3.2 +++ b/__brch__MC_shared	Mon Sep 03 15:02:35 2012 -0700
     3.3 @@ -1,4 +1,4 @@
     3.4  This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
     3.5  
     3.6 -More importantly, the MC_shared  version of VMS requires a separat malloc implemeted by VMS code..  so this branch has modified the library to use the VMS-specific malloc.
     3.7 +More importantly, the MC_shared  version of PR requires a separat malloc implemeted by PR code..  so this branch has modified the library to use the PR-specific malloc.
     3.8