summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2016-06-17 11:45:16 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2016-06-17 11:45:16 +0000
commit5a1039acbefc9f8885b5467332a6dcb838f31379 (patch)
tree18cb8e06fbf73de2f36ddfdb844d6de9e179d4bf
parenta01b0686cbabaa07150096d3bd6372663b523580 (diff)
downloadpcre2-5a1039acbefc9f8885b5467332a6dcb838f31379.tar.gz
Exclude __INTEL_COMPILER in the test for __GNUC__.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@527 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--ChangeLog4
-rw-r--r--src/pcre2_match.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a3adc4..819e7ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,10 @@ show the texts for given error numbers (i.e. to call pcre2_get_error_message()
and display what it returns) and a few representative error codes are now
checked in RunTest.
+37. Added "&& !defined(__INTEL_COMPILER)" to the test for __GNUC__ in
+pcre2_match.c, in anticipation that this is needed for the same reason it was
+recently added to pcrecpp.cc in PCRE1.
+
Version 10.21 12-January-2016
-----------------------------
diff --git a/src/pcre2_match.c b/src/pcre2_match.c
index 8ac77ca..0763a23 100644
--- a/src/pcre2_match.c
+++ b/src/pcre2_match.c
@@ -465,7 +465,7 @@ Returns: a match() return code
*/
static int
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
__attribute__ ((noinline))
#endif
op_recurse_ovecsave(REGISTER PCRE2_SPTR eptr, PCRE2_SPTR callpat,