* 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/linkhash.c b/linkhash.c
index 7385401..998cf7d 100644
--- a/linkhash.c
+++ b/linkhash.c
@@ -41,7 +41,7 @@
unsigned long lh_char_hash(const void *k)
{
unsigned int h = 0;
- const char* data = k;
+ const char* data = (const char*)k;
while( *data!=0 ) h = h*129 + (unsigned int)(*data++) + LH_PRIME;
@@ -61,12 +61,12 @@
int i;
struct lh_table *t;
- t = calloc(1, sizeof(struct lh_table));
+ t = (struct lh_table*)calloc(1, sizeof(struct lh_table));
if(!t) lh_abort("lh_table_new: calloc failed\n");
t->count = 0;
t->size = size;
t->name = name;
- t->table = calloc(size, sizeof(struct lh_entry));
+ t->table = (struct lh_entry*)calloc(size, sizeof(struct lh_entry));
if(!t->table) lh_abort("lh_table_new: calloc failed\n");
t->free_fn = free_fn;
t->hash_fn = hash_fn;