diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-01-20 14:10:33 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-01-20 14:10:33 +0200 |
| commit | 741817ac5372c374b52b710dd8a4b0cc463ade99 (patch) | |
| tree | 46343899a7e7249c8306e227a59dabc4e9e04dec /src/tbf.h | |
| parent | 67731a160cc7c3e090236316af459f695593fc55 (diff) | |
| download | vmod-tbf-741817ac5372c374b52b710dd8a4b0cc463ade99.tar.gz vmod-tbf-741817ac5372c374b52b710dd8a4b0cc463ade99.tar.bz2 | |
Drop support for Varnish 3
* configure.ac: Use pkg-config. Save Varnishapi version
in VARNISHAPI_MAJOR, VARNISHAPI_MINOR, VARNISHAPI_PATCH
Refuse to run if it is prior to 4.1
* src/Makefile.am: Remove conditionals
* src/tbf.h: Remove Varnish 3.0 defines
* src/vmod-tbf.3: Update
* tests/Makefile.am: Remove conditionals
* tests/test00.vti: Rename to tests/test00.vtc
* tests/test02.vti: Rename to tests/test02.vtc
Diffstat (limited to 'src/tbf.h')
| -rw-r--r-- | src/tbf.h | 20 |
1 files changed, 5 insertions, 15 deletions
@@ -1,8 +1,8 @@ /* This file is part of vmod-tbf - Copyright (C) 2013-2014 Sergey Poznyakoff + Copyright (C) 2013-2016 Sergey Poznyakoff Vmod-tbf is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -22,20 +22,10 @@ #include <inttypes.h> #include <sys/stat.h> #include <sys/time.h> #include "vrt.h" #include "vcc_if.h" #include "pthread.h" -#if VARNISHVERSION == 3 -# include "bin/varnishd/cache.h" -# define VCL_VOID void -# define VCL_INT int -# define VCL_REAL double -# define VCL_BOOL unsigned -# define VCL_STRING const char * -# define MOD_CTX struct sess * -# define WSPTR(s) ((s)->wrk->ws) -#else -# include "bin/varnishd/cache/cache.h" -# define MOD_CTX const struct vrt_ctx * -# define WSPTR(s) ((s)->ws) -#endif + +#include "bin/varnishd/cache/cache.h" +#define MOD_CTX const struct vrt_ctx * +#define WSPTR(s) ((s)->ws) |