Revision: 1655
http://vcs.pcre.org/viewvc?view=rev&revision=1655
Author: ph10
Date: 2016-06-14 10:01:52 +0100 (Tue, 14 Jun 2016)
Log Message:
-----------
Patch to allow compiling with Intel compiler.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/pcrecpp.cc
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2016-06-14 09:01:39 UTC (rev 1654)
+++ code/trunk/ChangeLog 2016-06-14 09:01:52 UTC (rev 1655)
@@ -93,7 +93,9 @@
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
-----------------------------
Modified: code/trunk/pcrecpp.cc
===================================================================
--- code/trunk/pcrecpp.cc 2016-06-14 09:01:39 UTC (rev 1654)
+++ code/trunk/pcrecpp.cc 2016-06-14 09:01:52 UTC (rev 1655)
@@ -66,7 +66,7 @@
// 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__)
