Patch to allow compiling with Intel compiler.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1655 2f5784b3-3f2a-0410-8824-cb99058d5e15

2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2caf2ff..382be58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,8 @@ Version 8.39 21-May-2016
 
 25. Refactor to fix a typo in pcre_jit_test.c
 
+26. Patch to support compiling pcrecpp.cc with Intel compiler.
+
 
 Version 8.38 23-November-2015
 -----------------------------
diff --git a/pcrecpp.cc b/pcrecpp.cc
index 142a0c0..d09c9ab 100644
--- a/pcrecpp.cc
+++ b/pcrecpp.cc
@@ -66,7 +66,7 @@ Arg RE::no_arg((void*)NULL);
 // inclusive test if we ever needed it.  (Note that not only the
 // __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
 // gnu-specific.)
-#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__)
+#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) && !defined(__INTEL_COMPILER)
 # define ULP_AS_STRING(x)            ULP_AS_STRING_INTERNAL(x)
 # define ULP_AS_STRING_INTERNAL(x)   #x
 # define USER_LABEL_PREFIX_STR       ULP_AS_STRING(__USER_LABEL_PREFIX__)