summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>2019-01-22 08:46:40 +0000
committerzherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>2019-01-22 08:46:40 +0000
commit36bcaeaf1afd4b9a733a72b03f6f5d40cb71c7ba (patch)
tree883b5e1242f0e6bc33cefdc6b17ae8bf22ea8791
parent10e4adbfe9aab5869079fba5edc0ce56fa1b078e (diff)
downloadpcre-36bcaeaf1afd4b9a733a72b03f6f5d40cb71c7ba.tar.gz
JIT compiler update.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1746 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--sljit/sljitExecAllocator.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sljit/sljitExecAllocator.c b/sljit/sljitExecAllocator.c
index 7a97114..3b37a97 100644
--- a/sljit/sljitExecAllocator.c
+++ b/sljit/sljitExecAllocator.c
@@ -95,19 +95,18 @@ static SLJIT_INLINE void free_chunk(void *chunk, sljit_uw size)
#else
#ifdef __APPLE__
-// Configures TARGET_OS_MAC when appropriate.
+/* Configures TARGET_OS_OSX when appropriate */
#include <TargetConditionals.h>
-#if defined TARGET_OS_MAC && defined MAP_JIT
+#if TARGET_OS_OSX && defined(MAP_JIT)
#include <sys/utsname.h>
-#endif /* TARGET_OS_MAC && MAP_JIT */
-#endif /* __APPLE__ */
+#endif /* TARGET_OS_OSX && MAP_JIT */
#ifdef MAP_JIT
static SLJIT_INLINE int get_map_jit_flag()
{
-#ifdef TARGET_OS_MAC
+#if TARGET_OS_OSX
/* On macOS systems, returns MAP_JIT if it is defined _and_ we're running on a version
of macOS where it's OK to have more than one JIT block. On non-macOS systems, returns
MAP_JIT if it is defined. */
@@ -126,13 +125,15 @@ static SLJIT_INLINE int get_map_jit_flag()
}
return map_jit_flag;
-#else /* !TARGET_OS_MAC */
+#else /* !TARGET_OS_OSX */
return MAP_JIT;
-#endif /* TARGET_OS_MAC */
+#endif /* TARGET_OS_OSX */
}
#endif /* MAP_JIT */
+#endif /* __APPLE__ */
+
static SLJIT_INLINE void* alloc_chunk(sljit_uw size)
{
void *retval;