summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2021-08-28 12:49:58 +0200
committerWilly Tarreau <w@1wt.eu>2021-08-28 12:49:58 +0200
commita01f8ce2d4cf54d1d2b210a8bf2b0437ed15cdb9 (patch)
treed629efbbb879335feac514d75ea04aa8210d8d86
parentfc89c3fd2b773e67c351f74459401ab6b8ac6c8c (diff)
downloadhaproxy-a01f8ce2d4cf54d1d2b210a8bf2b0437ed15cdb9.tar.gz
BUILD/MINOR: regex: avoid a build warning on USE_PCRE2 with -Wundef
regex-t emits a warning on #elif USE_PCRE2 when built with -Wundef, let's just fix it. This was reported in GH issue #1369.
-rw-r--r--include/haproxy/regex-t.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/haproxy/regex-t.h b/include/haproxy/regex-t.h
index ff415e8e1..33d88a2ea 100644
--- a/include/haproxy/regex-t.h
+++ b/include/haproxy/regex-t.h
@@ -36,7 +36,7 @@
#define PCRE_STUDY_JIT_COMPILE 0
#endif
-#elif USE_PCRE2
+#elif defined(USE_PCRE2)
#include <pcre2.h>
#include <pcre2posix.h>
@@ -53,7 +53,7 @@ struct my_regex {
#error "The PCRE lib doesn't support JIT. Change your lib, or remove the option USE_PCRE_JIT."
#endif
#endif
-#elif USE_PCRE2
+#elif defined(USE_PCRE2)
int(*mfn)(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, uint32_t, pcre2_match_data *, pcre2_match_context *);
pcre2_code *reg;
#else /* no PCRE */