From 5dbb6671a3b1041108616d59169b868f0a7c8646 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Thu, 15 Mar 2012 12:01:13 +0100 Subject: [PATCH] Fix compilation on OpenBSD. Thanks to Laurence Tratt. --- src/lj_alloc.c | 4 ++-- src/lj_err.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lj_alloc.c b/src/lj_alloc.c index c1aac00d..e4ce7634 100644 --- a/src/lj_alloc.c +++ b/src/lj_alloc.c @@ -188,14 +188,14 @@ static LJ_AINLINE void *CALL_MMAP(size_t size) return ptr; } -#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) /* OSX and FreeBSD mmap() use a naive first-fit linear search. ** That's perfect for us. Except that -pagezero_size must be set for OSX, ** otherwise the lower 4GB are blocked. And the 32GB RLIMIT_DATA needs ** to be reduced to 250MB on FreeBSD. */ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) #include #define MMAP_REGION_START ((uintptr_t)0x10000000) #else diff --git a/src/lj_err.c b/src/lj_err.c index c1e8c561..a4c74780 100644 --- a/src/lj_err.c +++ b/src/lj_err.c @@ -264,7 +264,7 @@ LJ_FUNCA int lj_err_unwind_dwarf(int version, _Unwind_Action actions, } #if LJ_UNWIND_EXT -#if LJ_TARGET_OSX +#if LJ_TARGET_OSX || defined(__OpenBSD__) /* Sorry, no thread safety for OSX. Complain to Apple, not me. */ static struct _Unwind_Exception static_uex; #else