From 0e7885bc9f4db1c3cde2b9c41ef227465db8158c Mon Sep 17 00:00:00 2001 From: Yves Rutschle Date: Sun, 6 Apr 2025 11:59:08 +0200 Subject: [PATCH] fix compilation when libproxyprotocol is not present --- proxyprotocol.c | 4 ++++ proxyprotocol.h | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/proxyprotocol.c b/proxyprotocol.c index aab218c..f609aa1 100644 --- a/proxyprotocol.c +++ b/proxyprotocol.c @@ -20,6 +20,8 @@ */ +#ifdef HAVE_PROXYPROTOCOL + #include #include "common.h" #include "log.h" @@ -112,3 +114,5 @@ int pp_write_header(int pp_version, struct connection* cnx) return 0; } + +#endif /* HAVE_PROXYPROTOCOL */ diff --git a/proxyprotocol.h b/proxyprotocol.h index fab0157..46a1b69 100644 --- a/proxyprotocol.h +++ b/proxyprotocol.h @@ -8,7 +8,7 @@ int pp_write_header(int pp_version, struct connection* cnx); #else /* HAVE_PROXYPROTOCOL */ -static inline int pp_write_header(int pp_version, struct connection* cnx) {} +static inline int pp_write_header(int pp_version, struct connection* cnx) { return 0; } #endif /* HAVE_PROXYPROTOCOL */ diff --git a/version.h b/version.h index dcf9f0b..5bb09ef 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION "v2.1.4-42-g4978641-dirty" +#define VERSION "v2.2.0-dirty" #endif