Merge pull request #22 from abiggerhammer/master

further OS X compat
This commit is contained in:
Meredith L. Patterson 2012-11-14 11:11:28 -08:00
commit ad4aa74b85
4 changed files with 4 additions and 4 deletions

View file

@ -2,7 +2,7 @@
#include "hammer.h"
#include "allocator.h"
#include <assert.h>
#include <malloc.h>
#include <stdlib.h>
#include <string.h>
// {{{ counted arrays

View file

@ -223,7 +223,7 @@ void h_hashtable_del(HHashTable* ht, void* key);
void h_hashtable_free(HHashTable* ht);
#if 0
#include <malloc.h>
#include <stdlib.h>
#define h_arena_malloc(a, s) malloc(s)
#endif

View file

@ -20,7 +20,7 @@
#include <string.h>
#include "hammer.h"
#include "internal.h"
#include <malloc.h>
#include <stdlib.h>
typedef struct pp_state {
int delta;

View file

@ -1,4 +1,4 @@
#include <malloc.h>
#include <stdlib.h>
#include "internal.h"
static void* system_alloc(HAllocator *allocator, size_t size) {