# HG changeset patch
# User Sean Halle <seanhalle@yahoo.com>
# Date 1374590463 25200
# Node ID 59eaf81a9cc7d3c336d4f00e30a7fe80702a4173
# Parent  c6e1805505c92a68197a612058ca8a49fa284e86
updated headers (fixed circular includes) and PR_int__malloc into PR__malloc

diff -r c6e1805505c9 -r 59eaf81a9cc7 DynArray.c
--- a/DynArray.c	Mon Jul 22 06:19:34 2013 -0700
+++ b/DynArray.c	Tue Jul 23 07:41:03 2013 -0700
@@ -10,6 +10,7 @@
 #include <malloc.h>
 
 #include "DynArray.h"
+#include "PR__common_includes/Services_offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
 
 //== declarations
 void
@@ -20,7 +21,7 @@
 makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray )
  { PrivDynArrayInfo *info;
 
-   info = PR_int__malloc( sizeof(PrivDynArrayInfo) );
+   info = PR__malloc( sizeof(PrivDynArrayInfo) );
 
    info->addrOfPtrToArray = addrOfPtrToArray;
    info->sizeOfArray      = sizeOfArray;
@@ -32,11 +33,11 @@
 makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray )
  { PrivDynArrayInfo *info;
 
-   info = PR_int__malloc( sizeof(PrivDynArrayInfo) );
+   info = PR__malloc( sizeof(PrivDynArrayInfo) );
 
    info->addrOfPtrToArray = addrOfPtrToArray;
 
-   *(addrOfPtrToArray)    = PR_int__malloc( sizeOfArray * sizeof(void *) );
+   *(addrOfPtrToArray)    = PR__malloc( sizeOfArray * sizeof(void *) );
    info->sizeOfArray      = sizeOfArray;
    info->numInArray       = 0;
    return info;
@@ -140,7 +141,7 @@
    if( newSize <= oldsizeOfArray ) return;
 
    oldArray         = *(info->addrOfPtrToArray);
-   newArray         = PR_int__malloc( newSize * sizeof(void *) );
+   newArray         = PR__malloc( newSize * sizeof(void *) );
 
    for( i = 0; i < oldsizeOfArray; i++ )
     {
@@ -149,10 +150,10 @@
    *(info->addrOfPtrToArray) = newArray; //change location of array-ptr
    info->sizeOfArray = newSize;
 
-   PR_int__free( oldArray );
+   PR__free( oldArray );
  }
 
-/*Can't mix PR_int__malloc locations with external malloc locations -- so use
+/*Can't mix PR__malloc locations with external malloc locations -- so use
  * this version inside PR, which will perform normal malloc in the core
  * loop -- hopefully avoiding the annoying system-stack bugs..
  */
@@ -184,8 +185,8 @@
 freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr )
  {
    forAllInDynArrayDo( info, freeFnPtr );
-   PR_int__free( *(info->addrOfPtrToArray) );
-   PR_int__free( info );
+   PR__free( *(info->addrOfPtrToArray) );
+   PR__free( info );
  }
 
 /* Only frees the info
@@ -193,7 +194,7 @@
 void
 freeDynArrayFlat( PrivDynArrayInfo *info )
  {
-   PR_int__free( info );
+   PR__free( info );
  }
 
 
diff -r c6e1805505c9 -r 59eaf81a9cc7 DynArray.h
--- a/DynArray.h	Mon Jul 22 06:19:34 2013 -0700
+++ b/DynArray.h	Tue Jul 23 07:41:03 2013 -0700
@@ -8,7 +8,7 @@
 #ifndef _DYNARRAY_H
 #define	_DYNARRAY_H
 
-#include "PR__application_includes/PR__application.h"
+#include "PR__common_includes/PR__primitive_data_types.h"