Version 2.4; Support for varnish 6.0.2release-2.4

5 files changed, 21 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 3ee8124..0300ec3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-vmod-dbrw -- history of user-visible changes. 2018-12-08
+vmod-dbrw -- history of user-visible changes. 2018-12-10
 See the end of file for copying conditions.
@@ -5,2 +5,7 @@ Please send vmod-dbrw bug reports to <gray@gnu.org>
 
+Version 2.4, 2018-12-10
+
+* Support for Varnish version 6.0.2
+
+
 Version 2.3, 2018-12-08
diff --git a/acvmod b/acvmod
-Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81
+Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/configure.ac b/configure.ac
index 420041e..62c3afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,3 +16,3 @@
 AC_PREREQ(2.69)
-AC_INIT([vmod-dbrw], 2.3, [gray@gnu.org])
+AC_INIT([vmod-dbrw], 2.4, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -45,3 +45,5 @@ AC_CHECK_HEADERS([sys/stdlib.h])
 
-AM_VARNISHAPI([4.1],[5.2.1])
+AM_VARNISHAPI([4.1],[6.0.2])
+AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
+                   [Varnish API major version number])
 
diff --git a/doc/vmod-dbrw.3 b/doc/vmod-dbrw.3
index 21d15e2..f069ce2 100644
--- a/doc/vmod-dbrw.3
+++ b/doc/vmod-dbrw.3
@@ -300,3 +300,3 @@ sub vcl_synth {
 .	ds package vmod-dbrw
-.	ds version 2.2.91
+.	ds version 2.4
 .	so download.inc
diff --git a/src/dbrw.h b/src/dbrw.h
index 1ff1056..bd0aa2a 100644
--- a/src/dbrw.h
+++ b/src/dbrw.h
@@ -23,6 +23,12 @@
 
-#include "vcl.h"
-#include "vrt.h"
-#include "vcc_if.h"
-#include "cache/cache.h"
+#if VARNISHAPI_MAJOR > 5
+# include "cache/cache.h"
+# include "vcl.h"
+# include "vcc_if.h"
+#else
+# include "vcl.h"
+# include "vrt.h"
+# include "vcc_if.h"
+# include "cache/cache.h"
+#endif
 #define WSPTR(s) ((s)->ws)