From: Willy Tarreau <w@1wt.eu>
Date: Tue, 20 Apr 2021 17:19:53 +0000 (+0200)
Subject: CONTRIB: mod_defender: make the code build with the embedded includes
X-Git-Tag: v2.4-dev17~50
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=131799fc97c6818928ef89a98f593980fbf94fa4;p=haproxy.git

CONTRIB: mod_defender: make the code build with the embedded includes

From now on the code only needs its embedded dependencies and does not
depend any more on external haproxy dependencies. It can now be built
as a standalone project.
---

diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile
index ca06cefbc..dfd0b741e 100644
--- a/contrib/mod_defender/Makefile
+++ b/contrib/mod_defender/Makefile
@@ -28,7 +28,7 @@ EVENT_INC := /usr/include
 endif
 
 CFLAGS  += -g -Wall -pthread
-INCS += -I../../include -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
+INCS += -Iinclude -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
 LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
 
 CXXFLAGS = -g -std=gnu++11
diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c
index e798a2275..fa3910e73 100644
--- a/contrib/mod_defender/defender.c
+++ b/contrib/mod_defender/defender.c
@@ -18,10 +18,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include <haproxy/api.h>
-#include <haproxy/chunk.h>
 #include <haproxy/spoe.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 #include <http_core.h>
diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c
index 78c009e2e..e96b95e74 100644
--- a/contrib/mod_defender/spoa.c
+++ b/contrib/mod_defender/spoa.c
@@ -31,7 +31,6 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <haproxy/chunk.h>
 #include <haproxy/list.h>
 #include <haproxy/spoe.h>