summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-06-30 11:20:20 +0200
committerJunio C Hamano <gitster@pobox.com>2018-08-03 10:42:51 -0700
commit45635ec92409cb2fd3c115e1efe588b26fcf43ca (patch)
treec5eb4acc0141309dc40a8b9bfa0f686e7ac0e9ff
parent1d89318c48d233d52f1db230cf622935ac3c69fa (diff)
downloadgit-45635ec92409cb2fd3c115e1efe588b26fcf43ca.tar.gz
apply.h: drop extern on func declaration
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--apply.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/apply.h b/apply.h
index b80d8ba736..01963b5ec4 100644
--- a/apply.h
+++ b/apply.h
@@ -111,14 +111,14 @@ struct apply_state {
int applied_after_fixing_ws;
};
-extern int apply_parse_options(int argc, const char **argv,
- struct apply_state *state,
- int *force_apply, int *options,
- const char * const *apply_usage);
-extern int init_apply_state(struct apply_state *state,
- const char *prefix);
-extern void clear_apply_state(struct apply_state *state);
-extern int check_apply_state(struct apply_state *state, int force_apply);
+int apply_parse_options(int argc, const char **argv,
+ struct apply_state *state,
+ int *force_apply, int *options,
+ const char * const *apply_usage);
+int init_apply_state(struct apply_state *state,
+ const char *prefix);
+void clear_apply_state(struct apply_state *state);
+int check_apply_state(struct apply_state *state, int force_apply);
/*
* Some aspects of the apply behavior are controlled by the following
@@ -127,9 +127,8 @@ extern int check_apply_state(struct apply_state *state, int force_apply);
#define APPLY_OPT_INACCURATE_EOF (1<<0) /* accept inaccurate eof */
#define APPLY_OPT_RECOUNT (1<<1) /* accept inaccurate line count */
-extern int apply_all_patches(struct apply_state *state,
- int argc,
- const char **argv,
- int options);
+int apply_all_patches(struct apply_state *state,
+ int argc, const char **argv,
+ int options);
#endif