BINHEAP_NOIDX should come from the binheap implementation.

Now it does.

bin/varnishd/cache_expire.c

@@ -57,13 +57,6 @@ static pthread_t exp_thread;
 static struct binheap *exp_heap;
 static struct lock exp_mtx;
 
-/*
- * This is a magic marker for the objects currently on the SIOP [look it up]
- * so that other users of the object will not stumble trying to change the
- * ttl or lru position.
- */
-#define BINHEAP_NOIDX 0		/* XXX: should be in binary_heap.h */
-
 /*--------------------------------------------------------------------
  * When & why does the timer fire for this object ?
  */

include/binary_heap.h

@@ -79,3 +79,4 @@ void *binheap_root(const struct binheap *);
 	 * Return the root item
 	 */
 
+#define BINHEAP_NOIDX	0

lib/libvarnish/binary_heap.c

@@ -351,7 +351,7 @@ binheap_delete(struct binheap *bh, unsigned idx)
 	assert(idx < bh->next);
 	assert(idx > 0);
 	assert(A(bh, idx) != NULL);
-	bh->update(bh->priv, A(bh, idx), 0);
+	bh->update(bh->priv, A(bh, idx), BINHEAP_NOIDX);
 	if (idx == --bh->next) {
 		A(bh, bh->next) = NULL;
 		return;