# HG changeset patch
# User Me@portablequad
# Date 1329015621 28800
# Node ID 62b3a4793b6e4ab5b020eda59f10e114971fa2c9
# Parent  596260ad0ede61365984502b874df1e8a6e47227
chgd files to VMS__malloc and correct includes

diff -r 596260ad0ede -r 62b3a4793b6e DynArray.c
--- a/DynArray.c	Sat Feb 11 18:20:50 2012 -0800
+++ b/DynArray.c	Sat Feb 11 19:00:21 2012 -0800
@@ -9,7 +9,6 @@
 #include <stdio.h>
 
 #include "DynArray.h"
-#include "../vmalloc.h"
 
 //== declarations
 void
@@ -20,7 +19,7 @@
 makePrivDynArrayInfoFrom( void ***addrOfPtrToArray, int32 sizeOfArray )
  { PrivDynArrayInfo *info;
 
-   info = malloc( sizeof(PrivDynArrayInfo) );
+   info = VMS__malloc( sizeof(PrivDynArrayInfo) );
 
    info->addrOfPtrToArray = addrOfPtrToArray;
    info->sizeOfArray      = sizeOfArray;
@@ -32,11 +31,11 @@
 makePrivDynArrayOfSize( void ***addrOfPtrToArray, int32 sizeOfArray )
  { PrivDynArrayInfo *info;
 
-   info = malloc( sizeof(PrivDynArrayInfo) );
+   info = VMS__malloc( sizeof(PrivDynArrayInfo) );
 
    info->addrOfPtrToArray = addrOfPtrToArray;
 
-   *(addrOfPtrToArray)    = malloc( sizeOfArray * sizeof(void *) );
+   *(addrOfPtrToArray)    = VMS__malloc( sizeOfArray * sizeof(void *) );
    info->sizeOfArray      = sizeOfArray;
    info->numInArray       = 0;
    return info;
@@ -140,7 +139,7 @@
    if( newSize <= oldSizeOfArray ) return;
 
    oldArray         = *(info->addrOfPtrToArray);
-   newArray         = malloc( newSize * sizeof(void *) );
+   newArray         = VMS__malloc( newSize * sizeof(void *) );
 
    for( i = 0; i < oldSizeOfArray; i++ )
     {
@@ -149,10 +148,10 @@
    *(info->addrOfPtrToArray) = newArray; //change location of array-ptr
    info->sizeOfArray = newSize;
 
-   free( oldArray );
+   VMS__free( oldArray );
  }
 
-/*Can't mix malloc locations with external malloc locations -- so use
+/*Can't mix VMS__malloc locations with external malloc locations -- so use
  * this version inside VMS, which will perform normal malloc in the core
  * loop -- hopefully avoiding the annoying system-stack bugs..
  */
@@ -184,8 +183,8 @@
 freeDynArrayDeep( PrivDynArrayInfo *info, FreeFnPtr freeFnPtr )
  {
    forAllInDynArrayDo( info, freeFnPtr );
-   free( *(info->addrOfPtrToArray) );
-   free( info );
+   VMS__free( *(info->addrOfPtrToArray) );
+   VMS__free( info );
  }
 
 /* Only frees the info
@@ -193,7 +192,7 @@
 void
 freeDynArrayFlat( PrivDynArrayInfo *info )
  {
-   free( info );
+   VMS__free( info );
  }
 
 
diff -r 596260ad0ede -r 62b3a4793b6e DynArray.h
--- a/DynArray.h	Sat Feb 11 18:20:50 2012 -0800
+++ b/DynArray.h	Sat Feb 11 19:00:21 2012 -0800
@@ -8,6 +8,9 @@
 #ifndef _DYNARRAY_H
 #define	_DYNARRAY_H
 
+#include "../../VMS_Implementations/VMS_impl/VMS_primitive_data_types.h"
+#include "../../VMS_Implementations/VMS_impl/vmalloc.h"
+
 
    //A dynamic array is same as any other array, but add a DynArrayInfo next
    // to it.  Accesses and updates of array indexes are done normally, it's