# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1683979066 -7200
# Node ID 0fe37636be045d98a642aca622d15796c5381e03
# Parent  7d663f770c5a0c786229541f8b914f956e7ca37f# Parent  d313e8ece0b88d4431c5b7793caa5b27fa2e5bd2
maint: Merge stable to default.

diff -r 7d663f770c5a -r 0fe37636be04 liboctave/util/lo-regexp.cc
--- a/liboctave/util/lo-regexp.cc	Sat May 13 13:33:57 2023 +0200
+++ b/liboctave/util/lo-regexp.cc	Sat May 13 13:57:46 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)