diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-09 16:26:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-09 16:26:35 -0700 |
| commit | c2c865684bf24ba422bb2624a5260df7302976fe (patch) | |
| tree | 7e7e5464cbf08350f3d9d7101863508146d9bdff /usage.c | |
| parent | 302e99b79a47e55274c9ba91bb7ac9d5d6292925 (diff) | |
| parent | 18660bc96ec0419cc096a53998d3197f2b905e8a (diff) | |
| download | git-c2c865684bf24ba422bb2624a5260df7302976fe.tar.gz | |
Merge branch 'ef/msvc-noreturn'
* ef/msvc-noreturn:
add NORETURN_PTR for function pointers
increase portability of NORETURN declarations
Diffstat (limited to 'usage.c')
| -rw-r--r-- | usage.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -36,12 +36,12 @@ static void warn_builtin(const char *warn, va_list params) /* If we are in a dlopen()ed .so write to a global variable would segfault * (ugh), so keep things static. */ -static void (*usage_routine)(const char *err) NORETURN = usage_builtin; -static void (*die_routine)(const char *err, va_list params) NORETURN = die_builtin; +static NORETURN_PTR void (*usage_routine)(const char *err) = usage_builtin; +static NORETURN_PTR void (*die_routine)(const char *err, va_list params) = die_builtin; static void (*error_routine)(const char *err, va_list params) = error_builtin; static void (*warn_routine)(const char *err, va_list params) = warn_builtin; -void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN) +void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params)) { die_routine = routine; } |