1.1 --- a/DynArray.c	Mon Jul 22 06:19:34 2013 -0700
     1.2 +++ b/DynArray.c	Tue Jul 23 07:41:03 2013 -0700
     1.3 @@ -10,6 +10,7 @@
     1.4  #include <malloc.h>
     1.5  
     1.6  #include "DynArray.h"
     1.7 +#include "PR__common_includes/Services_offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
     1.8  
     1.9  //== declarations
    1.10  void
    1.11 @@ -20,7 +21,7 @@
    1.12  makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray )
    1.13   { PrivDynArrayInfo *info;
    1.14  
    1.15 -   info = PR_int__malloc( sizeof(PrivDynArrayInfo) );
    1.16 +   info = PR__malloc( sizeof(PrivDynArrayInfo) );
    1.17  
    1.18     info->addrOfPtrToArray = addrOfPtrToArray;
    1.19     info->sizeOfArray      = sizeOfArray;
    1.20 @@ -32,11 +33,11 @@
    1.21  makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray )
    1.22   { PrivDynArrayInfo *info;
    1.23  
    1.24 -   info = PR_int__malloc( sizeof(PrivDynArrayInfo) );
    1.25 +   info = PR__malloc( sizeof(PrivDynArrayInfo) );
    1.26  
    1.27     info->addrOfPtrToArray = addrOfPtrToArray;
    1.28  
    1.29 -   *(addrOfPtrToArray)    = PR_int__malloc( sizeOfArray * sizeof(void *) );
    1.30 +   *(addrOfPtrToArray)    = PR__malloc( sizeOfArray * sizeof(void *) );
    1.31     info->sizeOfArray      = sizeOfArray;
    1.32     info->numInArray       = 0;
    1.33     return info;
    1.34 @@ -140,7 +141,7 @@
    1.35     if( newSize <= oldsizeOfArray ) return;
    1.36  
    1.37     oldArray         = *(info->addrOfPtrToArray);
    1.38 -   newArray         = PR_int__malloc( newSize * sizeof(void *) );
    1.39 +   newArray         = PR__malloc( newSize * sizeof(void *) );
    1.40  
    1.41     for( i = 0; i < oldsizeOfArray; i++ )
    1.42      {
    1.43 @@ -149,10 +150,10 @@
    1.44     *(info->addrOfPtrToArray) = newArray; //change location of array-ptr
    1.45     info->sizeOfArray = newSize;
    1.46  
    1.47 -   PR_int__free( oldArray );
    1.48 +   PR__free( oldArray );
    1.49   }
    1.50  
    1.51 -/*Can't mix PR_int__malloc locations with external malloc locations -- so use
    1.52 +/*Can't mix PR__malloc locations with external malloc locations -- so use
    1.53   * this version inside PR, which will perform normal malloc in the core
    1.54   * loop -- hopefully avoiding the annoying system-stack bugs..
    1.55   */
    1.56 @@ -184,8 +185,8 @@
    1.57  freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr )
    1.58   {
    1.59     forAllInDynArrayDo( info, freeFnPtr );
    1.60 -   PR_int__free( *(info->addrOfPtrToArray) );
    1.61 -   PR_int__free( info );
    1.62 +   PR__free( *(info->addrOfPtrToArray) );
    1.63 +   PR__free( info );
    1.64   }
    1.65  
    1.66  /* Only frees the info
    1.67 @@ -193,7 +194,7 @@
    1.68  void
    1.69  freeDynArrayFlat( PrivDynArrayInfo *info )
    1.70   {
    1.71 -   PR_int__free( info );
    1.72 +   PR__free( info );
    1.73   }
    1.74  
    1.75  

     2.1 --- a/DynArray.h	Mon Jul 22 06:19:34 2013 -0700
     2.2 +++ b/DynArray.h	Tue Jul 23 07:41:03 2013 -0700
     2.3 @@ -8,7 +8,7 @@
     2.4  #ifndef _DYNARRAY_H
     2.5  #define	_DYNARRAY_H
     2.6  
     2.7 -#include "PR__application_includes/PR__application.h"
     2.8 +#include "PR__common_includes/PR__primitive_data_types.h"
     2.9  
    2.10  
    2.11