Merge branch 'tb/unicode-7.0-display-width'

diff --git a/cache.h b/cache.h
index 1e4b4f06e1ee013db0cb696115ead61a76087f4e..cbe1935ba6b17b6ccc37a400ea7cf0f67830e1d0 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -826,7 +826,6 @@ int normalize_path_copy(char *dst, const char *src);
 int longest_ancestor_length(const char *path, struct string_list *prefixes);
 char *strip_path_suffix(const char *path, const char *suffix);
 int daemon_avoid_alias(const char *path);
-int offset_1st_component(const char *path);
 
 /* object replacement */
 #define LOOKUP_REPLACE_OBJECT 1