Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / regexp.h

diff --git a/lib/regexp.h b/lib/regexp.h
index ea9bfaf653fe454446d9114a35f730b07915b4e6..94c1019e2652733603a50bad0f1fce5c1537751e 100644 (file)
--- a/lib/regexp.h
+++ b/lib/regexp.h
@@ -21,7 +21,15 @@
 #ifndef REGEXP_H
 #define REGEXP_H
 
 #ifndef REGEXP_H
 #define REGEXP_H
 

-#if defined(HAVE_PCRE_H)
+#if defined(HAVE_LIBPCRE2)
+# ifndef PCRE2_CODE_UNIT_WIDTH
+#   define PCRE2_CODE_UNIT_WIDTH 8
+# endif
+# include <pcre2.h>
+  typedef pcre2_code regexp;
+# define RXF_CASELESS PCRE2_CASELESS
+# define RXERR_NOMATCH PCRE2_ERROR_NOMATCH
+#elif defined(HAVE_PCRE_H)

 # include <pcre.h>
   typedef pcre regexp;
 # define RXF_CASELESS PCRE_CASELESS
 # include <pcre.h>
   typedef pcre regexp;
 # define RXF_CASELESS PCRE_CASELESS