From 87ff2f5ebb147d6800b838d8e9dd6063305ddd47 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 23 Mar 2020 17:46:47 +0200 Subject: Restore backward compatibility with <6.2 --- configure.ac | 2 +- src/vmod_dict.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1dc3887..c37cc81 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ AC_HEADER_STDC # Check for functions -AM_VARNISHAPI([4.1],[6.3.1]) +AM_VARNISHAPI([4.1],[6.3.2]) AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR], [Varnish API major version number]) diff --git a/src/vmod_dict.c b/src/vmod_dict.c index 81f35e2..8c1e230 100644 --- a/src/vmod_dict.c +++ b/src/vmod_dict.c @@ -32,6 +32,14 @@ # include # include #endif + +#ifdef VPFX +# define VEVENT(a) VPFX(a) +#else +/* For compatibility with varnish prior to 6.2 */ +# define VEVENT(a) a +#endif + #include struct entry @@ -374,7 +382,7 @@ fill_table(void) } int -vmod_dict_event(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e) +VEVENT(dict_event)(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e) { switch (e) { case VCL_EVENT_LOAD: -- cgit v1.2.1