threads / patch / 20944

patch, 2 partsincrease portability of NORETURN declarations

Subject: [PATCH 1/2] increase portability of NORETURN declarations

## tl;dr

One message between Sep 14, 2009 and Sep 14, 2009. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Erik Faye-Lund· Sep 14, 2009, 11:49 UTC · lore

Some compilers (including at least MSVC) supports NORETURN on function declarations, but only before the function-name.

This patch makes it possible to define NORETURN for those compilers.
Signed-off-by: Erik Faye-Lund <kusmab...@gmail.com>
---

This patch requires specifying "-C 2" to "git am" to apply to the current maint(7fb6bcf), but I suspect that it's not really needed there. Supporting new compilers is going to require additional patching anyway.

 git-compat-util.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Show changes to git-compat-util.h +3 −3
diff --git a/git-compat-util.h b/git-compat-util.h
index e5e9f39..5876d91 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -177,9 +177,9 @@ extern char *gitbasename(char *);
 #include "compat/bswap.h"
 
 /* General helper functions */
-extern void usage(const char *err) NORETURN;
-extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
-extern void die_errno(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
+extern NORETURN void usage(const char *err);
+extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
+extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
 extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
 
-- 
1.6.4.msysgit.0.16.gd92d4.dirty

← back to recent threads