[PATCH] Add the merge test Linus called "test script from hell".

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 0901fae..c06b941 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -27,6 +27,7 @@
 #define DT_UNKNOWN     0
 #define DT_DIR         1
 #define DT_REG         2
+#define DT_LNK         3
 #define DTYPE(de)      DT_UNKNOWN
 #endif
 
@@ -103,8 +104,8 @@ static inline unsigned int create_ce_mode(unsigned int mode)
 
 #define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
 
-struct cache_entry **active_cache;
-unsigned int active_nr, active_alloc, active_cache_changed;
+extern struct cache_entry **active_cache;
+extern unsigned int active_nr, active_alloc, active_cache_changed;
 
 #define GIT_DIR_ENVIRONMENT "GIT_DIR"
 #define DEFAULT_GIT_DIR_ENVIRONMENT ".git"