diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-08-22 19:20:11 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-08-23 14:35:56 +0000 |
| commit | f537dc0da288949c4df903c1f2b21156e62fbae5 (patch) | |
| tree | 86f6baaee825af21a38950ce78501086fd0ae4b5 /src/3rdparty/pcre2/src/sljit/sljitConfig.h | |
| parent | 189e9c93d7ed42202ad51507c8944d64e9a7888d (diff) | |
PCRE2: upgrade to version 10.30
Minimal adjustments to config.h are necessary.
[ChangeLog][Third-Party Code] PCRE2 has been updated to version 10.30.
Change-Id: Iaca6a5ceffe4f5029212411eca8e2965ca7d9410
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/3rdparty/pcre2/src/sljit/sljitConfig.h')
| -rw-r--r-- | src/3rdparty/pcre2/src/sljit/sljitConfig.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/3rdparty/pcre2/src/sljit/sljitConfig.h b/src/3rdparty/pcre2/src/sljit/sljitConfig.h index a548c37ab6..b65584a4af 100644 --- a/src/3rdparty/pcre2/src/sljit/sljitConfig.h +++ b/src/3rdparty/pcre2/src/sljit/sljitConfig.h @@ -1,7 +1,7 @@ /* * Stack-less Just-In-Time compiler * - * Copyright 2009-2012 Zoltan Herczeg (hzmester@freemail.hu). All rights reserved. + * Copyright Zoltan Herczeg (hzmester@freemail.hu). All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, are * permitted provided that the following conditions are met: @@ -90,10 +90,20 @@ /* Executable code allocation: If SLJIT_EXECUTABLE_ALLOCATOR is not defined, the application should - define both SLJIT_MALLOC_EXEC and SLJIT_FREE_EXEC. */ + define SLJIT_MALLOC_EXEC, SLJIT_FREE_EXEC, and SLJIT_EXEC_OFFSET. */ #ifndef SLJIT_EXECUTABLE_ALLOCATOR /* Enabled by default. */ #define SLJIT_EXECUTABLE_ALLOCATOR 1 + +/* When SLJIT_PROT_EXECUTABLE_ALLOCATOR is enabled SLJIT uses + an allocator which does not set writable and executable + permission flags at the same time. The trade-of is increased + memory consumption and disabled dynamic code modifications. */ +#ifndef SLJIT_PROT_EXECUTABLE_ALLOCATOR +/* Disabled by default. */ +#define SLJIT_PROT_EXECUTABLE_ALLOCATOR 0 +#endif + #endif /* Force cdecl calling convention even if a better calling |