From 803bf4e012687d92f4c136febe0881852738d57d Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 4 Sep 2016 22:18:21 +0200 Subject: apply: rename and move opt constants to apply.h The constants for the "inaccurate-eof" and the "recount" options will be used in both "apply.c" and "builtin/apply.c", so they need to go into "apply.h", and therefore they need a name that is more specific to the API they belong to. Helped-by: Stefan Beller Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- apply.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'apply.h') diff --git a/apply.h b/apply.h index 53f09b5a45..48abd8eb7a 100644 --- a/apply.h +++ b/apply.h @@ -108,4 +108,11 @@ extern int init_apply_state(struct apply_state *state, extern void clear_apply_state(struct apply_state *state); extern int check_apply_state(struct apply_state *state, int force_apply); +/* + * Some aspects of the apply behavior are controlled by the following + * bits in the "options" parameter passed to apply_all_patches(). + */ +#define APPLY_OPT_INACCURATE_EOF (1<<0) /* accept inaccurate eof */ +#define APPLY_OPT_RECOUNT (1<<1) /* accept inaccurate line count */ + #endif -- cgit v1.2.3