Mercurial > octave
changeset 32091:d313e8ece0b8 stable
lo-regexp.cc: Only include PCRE2/PCRE headers if feature test succeeded (bug #64172).
* liboctave/util/lo-regexp.cc: Condition inclusion of PCRE2/PCRE headers on
whether the configure test for the respective libraries succeeded.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 13 May 2023 13:57:14 +0200 |
| parents | e2911d0176dc |
| children | 0fe37636be04 6cd803819bd2 |
| files | liboctave/util/lo-regexp.cc |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/util/lo-regexp.cc Fri May 12 08:00:41 2023 +0200 +++ b/liboctave/util/lo-regexp.cc Sat May 13 13:57:14 2023 +0200 @@ -32,14 +32,14 @@ #include <string> #include <vector> -#if defined (HAVE_PCRE2_H) || defined (HAVE_PCRE2_PCRE2_H) +#if defined (HAVE_PCRE2) # define PCRE2_CODE_UNIT_WIDTH 8 # if defined (HAVE_PCRE2_H) # include <pcre2.h> # elif defined (HAVE_PCRE2_PCRE2_H) # include <pcre2/pcre2.h> # endif -#elif defined (HAVE_PCRE_H) || defined (HAVE_PCRE_PCRE_H) +#elif defined (HAVE_PCRE) # if defined (HAVE_PCRE_H) # include <pcre.h> # elif defined (HAVE_PCRE_PCRE_H)