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 /index-pack.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 'index-pack.c')
-rw-r--r-- | index-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/index-pack.c b/index-pack.c index 340074fc79..b4f8278659 100644 --- a/index-pack.c +++ b/index-pack.c @@ -206,8 +206,8 @@ static void parse_pack_header(void) use(sizeof(struct pack_header)); } -static void bad_object(unsigned long offset, const char *format, - ...) NORETURN __attribute__((format (printf, 2, 3))); +static NORETURN void bad_object(unsigned long offset, const char *format, + ...) __attribute__((format (printf, 2, 3))); static void bad_object(unsigned long offset, const char *format, ...) { |