Remove VC#4013 workaround where not needed

src/fellow_cache_storage.h

@@ -47,9 +47,7 @@ fib(uint64_t n, uint8_t bits)
 	return (r);
 }
 
-/*
- * XXX to be removed when
- * https://github.com/varnishcache/varnish-cache/pull/4013
- * is merged
- */
+// https://github.com/varnishcache/varnish-cache/pull/4013
+#if VRT_MAJOR_VERSION < 18U || (VRT_MAJOR_VERSION == 18 && VRT_MINOR_VERSION < 1)
 #define VC_4013_WORKAROUND
+#endif

src/fellow_storage.c

@@ -950,7 +950,9 @@ sfemem_getspace(struct worker *wrk, struct objcore *oc, ssize_t *ssz,
 #endif
 
 	fcr = fellow_busy_obj_getspace(sfe_fbo(oc), &sz, ptr);
+#ifdef VC_4013_WORKAROUND
   out:
+#endif
 	if (fcr.status != fcr_ok) {
 		VSLb(wrk->vsl, SLT_Error, "GetSpace: %s",
 		    fcr.r.err ? fcr.r.err : "Unknown error");