increase portability of NORETURN declarations
Some compilers (including at least MSVC) support NORETURN on function declarations, but only before the function-name. This patch makes it possible to define NORETURN to something meaningful for those compilers. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:

committed by
Jeff King

parent
1be224ba6e
commit
a4f3131c07
6
usage.c
6
usage.c
@ -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 void (*usage_routine)(const char *err) = usage_builtin;
|
||||
static NORETURN 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 void (*routine)(const char *err, va_list params))
|
||||
{
|
||||
die_routine = routine;
|
||||
}
|
||||
|
Reference in New Issue
Block a user