From a4dc244b4e9eebe60ff2a32e340a0155836f2c32 Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Fri, 10 Feb 2017 05:44:04 -0500
Subject: [PATCH] Fix warnings and errors from 7373cf5

dircache.h has to be included no matter what.

Change-Id: Ib9ae4277615e8573b931d42fc6f1b3681d898bca
---
 apps/tagcache.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/tagcache.c b/apps/tagcache.c
index be4686679b..dfab06da20 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -82,9 +82,7 @@
 #include "pathfuncs.h"
 #include "structec.h"
 #include "debug.h"
-#ifdef HAVE_DIRCACHE
 #include "dircache.h"
-#endif
 
 #ifndef __PCTOOL__
 #include "lang.h"
@@ -768,7 +766,7 @@ static bool open_files(struct tagcache_search *tcs, int tag)
     return true;
 }
 
-static bool retrieve(struct tagcache_search *tcs, int idx_id,
+static bool retrieve(struct tagcache_search *tcs, IF_DIRCACHE(int idx_id,)
                      struct index_entry *idx, int tag, char *buf, long size)
 {
     struct tagfile_entry tfe;
@@ -1087,8 +1085,8 @@ static bool check_clauses(struct tagcache_search *tcs,
                 if (clause->tag == tag_filename
                     || clause->tag == tag_virt_basename)
                 {
-                    retrieve(tcs, tcs->idx_id, idx, tag_filename, buf,
-                             sizeof buf);
+                    retrieve(tcs, IF_DIRCACHE(tcs->idx_id,) idx, tag_filename,
+                             buf, sizeof buf);
                 }
                 else
                 {
@@ -1661,7 +1659,7 @@ bool tagcache_retrieve(struct tagcache_search *tcs, int idxid,
     if (!get_index(tcs->masterfd, idxid, &idx, true))
         return false;
     
-    return retrieve(tcs, idxid, &idx, tag, buf, size);
+    return retrieve(tcs, IF_DIRCACHE(idxid,) &idx, tag, buf, size);
 }
 
 static bool update_master_header(void)