packfile.h: move pack_window and pack_entry from cache.h

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index ffec289dc5d0f62e50031d1a65cd4678fc4df2e4..ffb9028f015c3246496e65441a915b4de98f6f56 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -593,20 +593,6 @@ int df_name_compare(const char *name1, size_t len1, int mode1,
 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
 
-struct pack_window {
-       struct pack_window *next;
-       unsigned char *base;
-       off_t offset;
-       size_t len;
-       unsigned int last_used;
-       unsigned int inuse_cnt;
-};
-
-struct pack_entry {
-       off_t offset;
-       struct packed_git *p;
-};
-
 /* Dumb servers support */
 int update_server_info(int);
 

diff --git a/packfile.h b/packfile.h
index 665603b696a1e852ea9b0de0de7268540fe2870d..c3692308b8dc866b2b99b2ed9b983db4d6d1352b 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -6,10 +6,22 @@
 
 /* in object-store.h */
 struct packed_git;
-struct pack_entry;
-struct pack_window;
 struct object_info;
 
+struct pack_window {
+       struct pack_window *next;
+       unsigned char *base;
+       off_t offset;
+       size_t len;
+       unsigned int last_used;
+       unsigned int inuse_cnt;
+};
+
+struct pack_entry {
+       off_t offset;
+       struct packed_git *p;
+};
+
 /*
  * Generate the filename to be used for a pack file with checksum "sha1" and
  * extension "ext". The result is written into the strbuf "buf", overwriting

diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 05c4f2b2625b8b634e859ff975de99621ec92026..b32abff7f117dfb9368b6437d90508e7c3c7353c 100644 (file)
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -5,6 +5,7 @@
 #include "repository.h"
 #include "object-store.h"
 #include "pack-bitmap.h"
+#include "packfile.h"
 #include "setup.h"
 
 static int read_midx_file(const char *object_dir, int show_objects)