diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:32 -0700 |
| commit | 5ade03446430f1190fdf1eca8b8fde5f63367110 (patch) | |
| tree | ba0c1878e9d5c96cfcb9668a3756a80b73600789 /diffcore.h | |
| parent | 36f0f344e71b928d47871e39fcef1908cb47c47b (diff) | |
| parent | 1076f1e454dae338cee8e48f3e69b58181e5e10a (diff) | |
| download | git-5ade03446430f1190fdf1eca8b8fde5f63367110.tar.gz | |
Merge branch 'en/incl-forward-decl'
Code hygiene improvement for the header files.
* en/incl-forward-decl:
Remove forward declaration of an enum
compat/precompose_utf8.h: use more common include guard style
urlmatch.h: fix include guard
Move definition of enum branch_track from cache.h to branch.h
alloc: make allocate_alloc_state and clear_alloc_state more consistent
Add missing includes and forward declarations
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 81281a398b..8d81a45f51 100644 --- a/diffcore.h +++ b/diffcore.h @@ -4,6 +4,10 @@ #ifndef DIFFCORE_H #define DIFFCORE_H +#include "cache.h" + +struct diff_options; + /* This header file is internal between diff.c and its diff transformers * (e.g. diffcore-rename, diffcore-pickaxe). Never include this header * in anything else. |