diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:32 +0900 |
| commit | 4aeeef377347934d6f459e27f7d793de4ce384bb (patch) | |
| tree | a8031c9623eac896bf474ba2158e39afc6abb5b3 /xdiff-interface.h | |
| parent | Merge branch 'ew/repack-with-bitmaps-by-default' (diff) | |
| parent | *.[ch]: manually align parameter lists (diff) | |
| download | tgif-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.xz | |
Merge branch 'dl/no-extern-in-func-decl'
Mechanically and systematically drop "extern" from function
declarlation.
* dl/no-extern-in-func-decl:
*.[ch]: manually align parameter lists
*.[ch]: remove extern from function declarations using sed
*.[ch]: remove extern from function declarations using spatch
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 2d41fffd4c..ede4246bbd 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -27,9 +27,9 @@ int read_mmfile(mmfile_t *ptr, const char *filename); void read_mmblob(mmfile_t *ptr, const struct object_id *oid); int buffer_is_binary(const char *ptr, unsigned long size); -extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); -extern void xdiff_clear_find_func(xdemitconf_t *xecfg); -extern int git_xmerge_config(const char *var, const char *value, void *cb); +void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); +void xdiff_clear_find_func(xdemitconf_t *xecfg); +int git_xmerge_config(const char *var, const char *value, void *cb); extern int git_xmerge_style; /* @@ -46,14 +46,14 @@ void discard_hunk_line(void *priv, * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces * are treated for the comparision. */ -extern int xdiff_compare_lines(const char *l1, long s1, - const char *l2, long s2, long flags); +int xdiff_compare_lines(const char *l1, long s1, + const char *l2, long s2, long flags); /* * Returns a hash of the string s of length len. * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces * are treated for the hash. */ -extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags); +unsigned long xdiff_hash_string(const char *s, size_t len, long flags); #endif |