[master] 76315ee make EXP_Rearm() non-private again - vmods use it

[Nils Goroll]

commit 76315ee568370b6cd3219fc336d3449c8e4c92fa
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Apr 20 17:32:40 2016 +0200

    make EXP_Rearm() non-private again - vmods use it
    
    Lack of this interface breaks existing vmods, so should we really need to
    remove it, we problable should provide an alternative.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index ef583f1..2b14c9b 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -713,6 +713,10 @@ extern pthread_t cli_thread;
 #define EXP_WHEN(to)							\
 	((to)->t_origin + (to)->ttl + (to)->grace + (to)->keep)
 
+/* cache_exp.c */
+void EXP_Rearm(struct objcore *, double now, double ttl, double grace,
+    double keep);
+
 /* cache_fetch.c */
 enum vbf_fetch_mode_e {
 	VBF_NORMAL = 0,
diff --git a/bin/varnishd/cache/cache_priv.h b/bin/varnishd/cache/cache_priv.h
index 315cf96..47330ee 100644
--- a/bin/varnishd/cache/cache_priv.h
+++ b/bin/varnishd/cache/cache_priv.h
@@ -45,8 +45,6 @@ void VBP_Init(void);
 /* cache_exp.c */
 double EXP_Ttl(const struct req *, const struct objcore *);
 void EXP_Insert(struct worker *wrk, struct objcore *oc);
-void EXP_Rearm(struct objcore *, double now, double ttl, double grace,
-    double keep);
 void EXP_Remove(struct objcore *);
 
 /* From cache_main.c */