X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=713cca785c4b986b5f667086ad43c324f248929c;hb=1689c5de8730ea334535337a341db3c7a21ad002;hp=8ae35785fd4439f466620ab9186838e7cb20fa36;hpb=264e0b9a3c090930eec8dd16ecacf551dc685ac1;p=git.git diff --git a/diffcore.h b/diffcore.h index 8ae35785f..713cca785 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 *);