Skip to content

Commit

Permalink
Alloc/free macros in the new sljit version take two arguments.
Browse files Browse the repository at this point in the history
  • Loading branch information
alnsn committed May 29, 2016
1 parent 7e4a206 commit 25eab58
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions sys/external/bsd/sljit/dist/sljit_src/sljitConfig.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: sljitConfig.h,v 1.13 2016/05/29 17:09:33 alnsn Exp $ */
/* $NetBSD: sljitConfig.h,v 1.14 2016/05/29 17:19:01 alnsn Exp $ */

/*
* Stack-less Just-In-Time compiler
Expand Down Expand Up @@ -60,11 +60,11 @@
#include <machine/sljit_machdep.h>

#if defined(_KERNEL) && !defined(SLJIT_MALLOC)
#define SLJIT_MALLOC(size) malloc((size), M_TEMP, M_WAITOK)
#define SLJIT_MALLOC(size, allocator_data) malloc((size), M_TEMP, M_WAITOK)
#endif

#if defined(_KERNEL) && !defined(SLJIT_FREE)
#define SLJIT_FREE(ptr) free((ptr), M_TEMP)
#define SLJIT_FREE(ptr, allocator_data) free((ptr), M_TEMP)
#endif

#if defined(_KERNEL) && !defined(SLJIT_CACHE_FLUSH)
Expand Down
4 changes: 2 additions & 2 deletions sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: sljitUtils.c,v 1.8 2016/05/29 17:09:33 alnsn Exp $ */
/* $NetBSD: sljitUtils.c,v 1.9 2016/05/29 17:19:01 alnsn Exp $ */

/*
* Stack-less Just-In-Time compiler
Expand Down Expand Up @@ -294,7 +294,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_stack* SLJIT_CALL sljit_allocate_stack(slj
v = uvm_km_alloc(kernel_map, max_limit, PAGE_SIZE, UVM_KMF_WIRED|UVM_KMF_ZERO);
base.ptr = (void *)v;
if (base.ptr == NULL) {
SLJIT_FREE(stack);
SLJIT_FREE(stack, allocator_data);
return NULL;
}
stack->base = base.uw;
Expand Down

0 comments on commit 25eab58

Please sign in to comment.