4 files changed, 25 insertions, 14 deletions

diff --git a/cache.c b/cache.cindex 7860fc75..89f7ecdc 100644--- a/cache.c+++ b/cache.c@@ -7,6 +7,7 @@  */  #include "cgit.h"+#include "cache.h"  const int NOLOCK = -1; 
diff --git a/cache.c b/cache.c
index 7860fc75..89f7ecdc 100644
--- a/cache.c
+++ b/cache.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 
 const int NOLOCK = -1;
 
diff --git a/cache.h b/cache.hnew file mode 100644index 00000000..4dcbea31--- /dev/null+++ b/cache.h@@ -0,0 +1,23 @@+/*+ * Since git has it's own cache.h which we include,+ * lets test on CGIT_CACHE_H to avoid confusion+ */++#ifndef CGIT_CACHE_H+#define CGIT_CACHE_H++struct cacheitem {+	char *name;+	struct stat st;+	int ttl;+	int fd;+};++extern char *cache_safe_filename(const char *unsafe);+extern int cache_lock(struct cacheitem *item);+extern int cache_unlock(struct cacheitem *item);+extern int cache_cancel_lock(struct cacheitem *item);+extern int cache_exist(struct cacheitem *item);+extern int cache_expired(struct cacheitem *item);++#endif /* CGIT_CACHE_H */
diff --git a/cache.h b/cache.h
new file mode 100644
index 00000000..4dcbea31
--- /dev/null
+++ b/cache.h
@@ -0,0 +1,23 @@
+/*
+ * Since git has it's own cache.h which we include,
+ * lets test on CGIT_CACHE_H to avoid confusion
+ */
+
+#ifndef CGIT_CACHE_H
+#define CGIT_CACHE_H
+
+struct cacheitem {
+	char *name;
+	struct stat st;
+	int ttl;
+	int fd;
+};
+
+extern char *cache_safe_filename(const char *unsafe);
+extern int cache_lock(struct cacheitem *item);
+extern int cache_unlock(struct cacheitem *item);
+extern int cache_cancel_lock(struct cacheitem *item);
+extern int cache_exist(struct cacheitem *item);
+extern int cache_expired(struct cacheitem *item);
+
+#endif /* CGIT_CACHE_H */
diff --git a/cgit.c b/cgit.cindex f749b6be..73b1f028 100644--- a/cgit.c+++ b/cgit.c@@ -7,6 +7,7 @@  */  #include "cgit.h"+#include "cache.h" #include "cmd.h" #include "ui-shared.h" 
diff --git a/cgit.c b/cgit.c
index f749b6be..73b1f028 100644
--- a/cgit.c
+++ b/cgit.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 #include "cmd.h"
 #include "ui-shared.h"
 
diff --git a/cgit.h b/cgit.hindex e82e9aab..f6009124 100644--- a/cgit.h+++ b/cgit.h@@ -46,13 +46,6 @@ typedef void (*configfn)(const char *name, const char *value); typedef void (*filepair_fn)(struct diff_filepair *pair); typedef void (*linediff_fn)(char *line, int len); -struct cacheitem {-	char *name;-	struct stat st;-	int ttl;-	int fd;-};- struct cgit_repo { 	char *url; 	char *name;@@ -227,13 +220,6 @@ extern struct commitinfo *cgit_parse_commit(struct commit *commit); extern struct taginfo *cgit_parse_tag(struct tag *tag); extern void cgit_parse_url(const char *url); -extern char *cache_safe_filename(const char *unsafe);-extern int cache_lock(struct cacheitem *item);-extern int cache_unlock(struct cacheitem *item);-extern int cache_cancel_lock(struct cacheitem *item);-extern int cache_exist(struct cacheitem *item);-extern int cache_expired(struct cacheitem *item);- extern const char *cgit_repobasename(const char *reponame);  extern int cgit_parse_snapshots_mask(const char *str);
diff --git a/cgit.h b/cgit.h
index e82e9aab..f6009124 100644
--- a/cgit.h
+++ b/cgit.h
@@ -46,13 +46,6 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
-struct cacheitem {
-	char *name;
-	struct stat st;
-	int ttl;
-	int fd;
-};
-
 struct cgit_repo {
 	char *url;
 	char *name;
@@ -227,13 +220,6 @@ extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
-extern char *cache_safe_filename(const char *unsafe);
-extern int cache_lock(struct cacheitem *item);
-extern int cache_unlock(struct cacheitem *item);
-extern int cache_cancel_lock(struct cacheitem *item);
-extern int cache_exist(struct cacheitem *item);
-extern int cache_expired(struct cacheitem *item);
-
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);