disambiguate source file names from varnish-cache

src/Makefile.am

@@ -10,8 +10,8 @@ vmod_LTLIBRARIES = libvmod_pesi.la
 libvmod_pesi_la_SOURCES = \
 	vdp_pesi.c \
 	foreign/qdef.h \
-	foreign/cache_esi_deliver.h \
-	foreign/cache_esi_deliver.c
+	foreign/from_cache_esi_deliver.h \
+	foreign/from_cache_esi_deliver.c
 
 nodist_libvmod_pesi_la_SOURCES = \
 	vcc_if.c \

src/foreign/cache_esi_deliver.c → src/foreign/from_cache_esi_deliver.c

@@ -48,7 +48,7 @@
 #include "vend.h"
 #include "vgz.h"
 
-#include "cache_esi_deliver.h"
+#include "from_cache_esi_deliver.h"
 
 /*---------------------------------------------------------------------
  * If a gzip'ed ESI object includes a ungzip'ed object, we need to make

src/vdp_pesi.c

@@ -44,7 +44,7 @@
 #include "cache/cache_esi.h"
 #include "cache/cache_objhead.h"
 #include "cache/cache_pool.h"
-#include "foreign/cache_esi_deliver.h"	// XXX rename
+#include "foreign/from_cache_esi_deliver.h"
 #include "storage/storage.h"
 #include "storage/storage_simple.h"
 #include "vcl.h"