# HG changeset patch # User Some Random Person # Date 1331360064 28800 # Node ID 0e6cc9d9ec677201b8768f63694bf6244498dd62 # Parent 94a5b324bc29c6c5ba6238c8955f82c4add75677 on MC_shared brch, changed VMS__malloc to VMS_int__malloc and added .hgeol diff -r 94a5b324bc29 -r 0e6cc9d9ec67 .hgeol --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgeol Fri Mar 09 22:14:24 2012 -0800 @@ -0,0 +1,14 @@ + +[patterns] +**.py = native +**.txt = native +**.c = native +**.h = native +**.cpp = native +**.java = native +**.class = bin +**.jar = bin +**.sh = native +**.pl = native +**.jpg = bin +**.gif = bin diff -r 94a5b324bc29 -r 0e6cc9d9ec67 ListOfArrays.c --- a/ListOfArrays.c Fri Mar 09 18:22:54 2012 -0800 +++ b/ListOfArrays.c Fri Mar 09 22:14:24 2012 -0800 @@ -3,7 +3,7 @@ #include "VMS_impl/vmalloc.h" ListOfArrays* makeListOfArrays(size_t entry_size, int num_entries_per_block){ - ListOfArrays* newLoA = (ListOfArrays*) VMS__malloc(sizeof(ListOfArrays)); + ListOfArrays* newLoA = (ListOfArrays*) VMS_int__malloc(sizeof(ListOfArrays)); newLoA->dim1info = makePrivDynArrayOfSize(&(newLoA->dim1),8); newLoA->entry_size = entry_size; @@ -32,15 +32,15 @@ } void freeListOfArrays(ListOfArrays* list){ - freeDynArrayDeep(list->dim1info,&VMS__free); - VMS__free((void*)list); + freeDynArrayDeep(list->dim1info,&VMS_int__free); + VMS_int__free((void*)list); } /* void addToListOfArraysDependency(Dependency value, ListOfArrays* list){ int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; if(offset_in_fragment == 0){ - void* newBlock = VMS__malloc(list->entry_size * list->num_entries_per_fragment); + void* newBlock = VMS_int__malloc(list->entry_size * list->num_entries_per_fragment); addToDynArray(newBlock,list->dim1info); } Dependency* typedFragment = (Dependency*) ((list->dim1)[list->dim1info->numInArray -1]); @@ -51,7 +51,7 @@ void addToListOfArraysUnit(Unit value, ListOfArrays* list){ int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; if(offset_in_fragment == 0){ - void* newBlock = VMS__malloc(list->entry_size * list->num_entries_per_fragment); + void* newBlock = VMS_int__malloc(list->entry_size * list->num_entries_per_fragment); addToDynArray(newBlock,list->dim1info); } Unit* typedFragment = (Unit*) ((list->dim1)[list->dim1info->numInArray -1]); diff -r 94a5b324bc29 -r 0e6cc9d9ec67 ListOfArrays.h --- a/ListOfArrays.h Fri Mar 09 18:22:54 2012 -0800 +++ b/ListOfArrays.h Fri Mar 09 22:14:24 2012 -0800 @@ -9,7 +9,7 @@ #define LISTOFARRAYS_H #include -#include "../DynArray/DynArray.h" +#include "DynArray/DynArray.h" typedef struct { @@ -31,7 +31,7 @@ #define addToListOfArrays(type,value,list) do { \ int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; \ if(offset_in_fragment == 0){ \ - void* newBlock = VMS__malloc(list->entry_size * list->num_entries_per_fragment); \ + void* newBlock = VMS_int__malloc(list->entry_size * list->num_entries_per_fragment); \ addToDynArray(newBlock,list->dim1info); \ } \ type* typedFragment = (type*) ((list->dim1)[list->dim1info->numInArray -1]); \