diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2020-11-18 14:37:44 +0100 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2020-11-18 14:37:44 +0100 |
commit | 9055db73d5b43b241730e643f220dfa5e35eb7c1 (patch) | |
tree | 972d9bf5049c7687702196c77281f4419ceba2df /pcre/pcrecpp.cc | |
parent | 8771390dfd3a98ae47b76b5f262af76aa8232cd7 (diff) | |
parent | 9b30212f15e280bef6d2a9be212c3295e912b959 (diff) | |
download | mariadb-git-9055db73d5b43b241730e643f220dfa5e35eb7c1.tar.gz |
Commit new source and all recent changes.
Diffstat (limited to 'pcre/pcrecpp.cc')
-rw-r--r-- | pcre/pcrecpp.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pcre/pcrecpp.cc b/pcre/pcrecpp.cc index 77a2fedc4be..ce289afafb8 100644 --- a/pcre/pcrecpp.cc +++ b/pcre/pcrecpp.cc @@ -66,7 +66,8 @@ 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__) && !defined(__INTEL_COMPILER) +#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) \ + && !defined(__INTEL_COMPILER) && !defined(__LCC__) # 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__) @@ -91,6 +92,7 @@ static const char *start_options[] = { "(*LIMIT_RECURSION=", "(*LIMIT_MATCH=", "(*CRLF)", + "(*LF)", "(*CR)", "(*BSR_UNICODE)", "(*BSR_ANYCRLF)", |