* Don't use this as a variable, so we can compile with a C++ compiler
* Add casts from void* to type of assignment when using malloc
* Add #ifdef __cplusplus guards to all of the headers
* Add typedefs for json_object, json_tokener, array_list, printbuf, lh_table
Michael Clark, <michael@metaparadigm.com>
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@33 327403b1-1117-474d-bef2-5cb71233fd97
diff --git a/arraylist.c b/arraylist.c
index 7726de6..1d93f44 100644
--- a/arraylist.c
+++ b/arraylist.c
@@ -28,11 +28,12 @@
{
struct array_list *arr;
- if(!(arr = calloc(1, sizeof(struct array_list)))) return NULL;
+ arr = (struct array_list*)calloc(1, sizeof(struct array_list));
+ if(!arr) return NULL;
arr->size = ARRAY_LIST_DEFAULT_SIZE;
arr->length = 0;
arr->free_fn = free_fn;
- if(!(arr->array = calloc(sizeof(void*), arr->size))) {
+ if(!(arr->array = (void**)calloc(sizeof(void*), arr->size))) {
free(arr);
return NULL;
}
@@ -64,7 +65,7 @@
if(max < arr->size) return 0;
new_size = max(arr->size << 1, max);
if(!(t = realloc(arr->array, new_size*sizeof(void*)))) return -1;
- arr->array = t;
+ arr->array = (void**)t;
(void)memset(arr->array + arr->size, 0, (new_size-arr->size)*sizeof(void*));
arr->size = new_size;
return 0;