X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;h=536f4e4d9784e0e5ffdc108a5be4bf758d1578ba;hb=792d2370f975f032a708cb35044193b5b5310840;hp=ec682a297108dc0a58203019693c1a1c4b0a91e1;hpb=c1e335a43fb4c2f422b4d78693b2344114209632;p=git.git diff --git a/xdiff-interface.h b/xdiff-interface.h index ec682a297..536f4e4d9 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -15,7 +15,9 @@ struct xdiff_emit_state { int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf); int parse_hunk_header(char *line, int len, - unsigned int *ob, unsigned int *on, - unsigned int *nb, unsigned int *nn); + int *ob, int *on, + int *nb, int *nn); +int read_mmfile(mmfile_t *ptr, const char *filename); +int buffer_is_binary(const char *ptr, unsigned long size); #endif