summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/pcre/sljit/sljitConfig.h
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2015-08-24 10:53:00 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2015-08-25 12:07:46 +0000
commitdbb1e1936ca9ddc66d2032448da63edec651a77a (patch)
tree05ab550d370501d8aceb394c1830d2646e8be920 /src/3rdparty/pcre/sljit/sljitConfig.h
parent4c3fa449acfc7ec43f3b2c53318c2838ceba5a86 (diff)
Bump PCRE to r1594
Get a couple of fixes for important bugs (1667, 1672). The WinCE build patch has also been merged upstream, so remove it from our tree. Change-Id: I933c2d824612a70d7bc52648df5f5c481ae066d7 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/3rdparty/pcre/sljit/sljitConfig.h')
-rw-r--r--src/3rdparty/pcre/sljit/sljitConfig.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/pcre/sljit/sljitConfig.h b/src/3rdparty/pcre/sljit/sljitConfig.h
index 10364c3b60..1c8a521aa8 100644
--- a/src/3rdparty/pcre/sljit/sljitConfig.h
+++ b/src/3rdparty/pcre/sljit/sljitConfig.h
@@ -96,6 +96,15 @@
#define SLJIT_EXECUTABLE_ALLOCATOR 1
#endif
+/* Force cdecl calling convention even if a better calling
+ convention (e.g. fastcall) is supported by the C compiler.
+ If this option is enabled, C functions without
+ SLJIT_CALL can also be called from JIT code. */
+#ifndef SLJIT_USE_CDECL_CALLING_CONVENTION
+/* Disabled by default */
+#define SLJIT_USE_CDECL_CALLING_CONVENTION 0
+#endif
+
/* Return with error when an invalid argument is passed. */
#ifndef SLJIT_ARGUMENT_CHECKS
/* Disabled by default */