commit 18660bc96ec0419cc096a53998d3197f2b905e8a
author Erik Faye-Lund <kusmabite@googlemail.com> Wed Sep 30 18:05:50 2009 +0000
committer Jeff King <peff@peff.net> Thu Oct 01 04:12:21 2009 -0400
tree 58038677551d5500049b48019bfe8debf904e2cb
parent a4f3131c07c1f601be1e24b2143ca7e2deea09b5

add NORETURN_PTR for function pointers

Some compilers (including at least MSVC and ARM RVDS) supports
NORETURN on function declarations, but not on function pointers.

This patch makes it possible to define NORETURN for these compilers,
by splitting the NORETURN macro into two - one for function
declarations and one for function pointers.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>

usage.c

diff --git a/usage.c b/usage.c
index 0555ce6..c488f3af 100644
--- a/usage.c
+++ b/usage.c
@@ -36,12 +36,12 @@
 
 /* If we are in a dlopen()ed .so write to a global variable would segfault
  * (ugh), so keep things static. */
-static NORETURN void (*usage_routine)(const char *err) = usage_builtin;
-static NORETURN void (*die_routine)(const char *err, va_list params) = 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(NORETURN void (*routine)(const char *err, va_list params))
+void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params))
 {
 	die_routine = routine;
 }