X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=5b634585e8970de81067b9807d8813c083b86b0a;hb=7183c09d11ac4b98f1cc78f29dcbd85df5533001;hp=1ebfdae8b8ba1ede00cddd17bfd0fb5610866d03;hpb=718258e256b74622aa55f5ee0cb9cff4cce6bf9f;p=git.git diff --git a/diffcore.h b/diffcore.h index 1ebfdae8b..5b634585e 100644 --- a/diffcore.h +++ b/diffcore.h @@ -22,6 +22,8 @@ #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */ +struct userdiff_driver; + struct diff_filespec { unsigned char sha1[20]; char *path; @@ -40,8 +42,10 @@ struct diff_filespec { #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0) unsigned should_free : 1; /* data should be free()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */ - unsigned checked_attr : 1; - unsigned is_binary : 1; /* data should be considered "binary" */ + + struct userdiff_driver *driver; + /* data should be considered "binary"; -1 means "don't know yet" */ + int is_binary; }; extern struct diff_filespec *alloc_filespec(const char *);