diff ListOfArrays.h @ 16:7731a4d31baa

new branch -- Univ_dev -- changed headers and PR__malloc
author Sean Halle <seanhalle@yahoo.com>
date Tue, 23 Jul 2013 07:30:42 -0700
parents 70c43c8fbded
children
line diff
     1.1 --- a/ListOfArrays.h	Mon Sep 03 15:08:15 2012 -0700
     1.2 +++ b/ListOfArrays.h	Tue Jul 23 07:30:42 2013 -0700
     1.3 @@ -9,6 +9,9 @@
     1.4  #define	_LISTOFARRAYS_H
     1.5  
     1.6  #include<stddef.h>
     1.7 +#include <inttypes.h>
     1.8 +
     1.9 +#include "PR__common_includes/PR__primitive_data_types.h"
    1.10  #include "DynArray/DynArray.h"
    1.11  
    1.12  
    1.13 @@ -31,7 +34,7 @@
    1.14  #define addToListOfArrays(type,value,list) do { \
    1.15      int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; \
    1.16      if(offset_in_fragment == 0){ \
    1.17 -        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); \
    1.18 +        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); \
    1.19          addToDynArray(newBlock,list->dim1info); \
    1.20      } \
    1.21      type* typedFragment = (type*) ((list->dim1)[list->dim1info->numInArray -1]); \