aboutsummaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-26 11:25:59 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-26 11:25:59 -0700
commit7a011aac0ef32e1b4835284c3ca6360729d7b83b (patch)
treeb5ed4a96ce170574b07ea9178ad90b44afe09ef7 /git-compat-util.h
parent40a9c3c9a0328f9b11b1fe5980888d509f26be4f (diff)
parent1ece66bc9e5433dff008786daba9918f3e2a6525 (diff)
downloadgit-7a011aac0ef32e1b4835284c3ca6360729d7b83b.tar.gz
git-7a011aac0ef32e1b4835284c3ca6360729d7b83b.tar.xz
Merge branch 'jk/a-thread-only-dies-once' into maint
* jk/a-thread-only-dies-once: run-command: use thread-aware die_is_recursing routine usage: allow pluggable die-recursion checks
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index e715285e7..ad4762499 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -327,6 +327,7 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)))
extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
extern void set_error_routine(void (*routine)(const char *err, va_list params));
+extern void set_die_is_recursing_routine(int (*routine)(void));
extern int prefixcmp(const char *str, const char *prefix);
extern int suffixcmp(const char *str, const char *suffix);