X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=a268d16ff712e29fbccab779824551757f99837d;hb=bbbc8c3a8d455e1f5d15c3764eba70250b5479e9;hp=8fac465a9df9b1d8789d17f008968295baa27ad1;hpb=bff606b8e9b897caeb66c4addfd16c04ebea0b8b;p=git.git diff --git a/diff.h b/diff.h index 8fac465a..a268d16f 100644 --- a/diff.h +++ b/diff.h @@ -4,17 +4,7 @@ #ifndef DIFF_H #define DIFF_H -#define DIFF_FILE_CANON_MODE(mode) \ - (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \ - S_ISLNK(mode) ? S_IFLNK : S_IFDIR) - -struct tree_desc { - void *buf; - unsigned long size; -}; - -extern void update_tree_entry(struct tree_desc *); -extern const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *); +#include "tree-walk.h" struct diff_options;