From 77bc854117a3b2aaa45871bf5890c6b78ae20e8c Mon Sep 17 00:00:00 2001
From: willy tarreau <willy@wtap.(none)>
Date: Sun, 18 Dec 2005 01:31:43 +0100
Subject: [PATCH] * building with -DUSE_PCRE should include PCRE headers and
 not regex.h. At   least on Solaris, this caused the libc's regex primitives
 to be used instead   of PCRE, which caused trouble on group references. This
 is now fixed.

---
 CHANGELOG | 5 +++++
 haproxy.c | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index edff112bbb..c046e3c3c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 ChangeLog :
 ===========
 
+2005/10/25
+  - building with -DUSE_PCRE should include PCRE headers and not regex.h. At
+    least on Solaris, this caused the libc's regex primitives to be used instead
+    of PCRE, which caused trouble on group references. This is now fixed.
+
 2005/10/09 : 1.2.7rc (1.1.33rc)
   - second batch of socklen_t changes.
   - clean-ups from Cameron Simpson.
diff --git a/haproxy.c b/haproxy.c
index e362df5bb8..723c15fbbe 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -52,8 +52,15 @@
 #include <stdarg.h>
 #include <sys/resource.h>
 #include <time.h>
-#include <regex.h>
 #include <syslog.h>
+
+#ifdef USE_PCRE
+#include <pcre.h>
+#include <pcreposix.h>
+#else
+#include <regex.h>
+#endif
+
 #if defined(TPROXY) && defined(NETFILTER)
 #include <linux/netfilter_ipv4.h>
 #endif
-- 
2.39.5