threads / patch / 22315

patch, 4 partsmsvc: Add a definition of NORETURN compatible with msvc compiler

Subject: [PATCH 4/4] msvc: Add a definition of NORETURN compatible with msvc compiler

## tl;dr

4 messages between Jan 20, 2010 and Jan 23, 2010. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Ramsay Jones· Jan 20, 2010, 19:45 UTC · lore
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

I thought that Erik had already submitted this patch along with those that resulted in commits a4f3131c and 18660bc9. However, I don't seem to be able to find it anywhere! (maybe I only imagined it).

If you find Erik's patch, please apply that instead...

ATB, Ramsay Jones

 git-compat-util.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Show changes to git-compat-util.h +3 −0
diff --git a/git-compat-util.h b/git-compat-util.h
index 5c59687..6efea29 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -177,6 +177,9 @@ extern char *gitbasename(char *);
 #ifdef __GNUC__
 #define NORETURN __attribute__((__noreturn__))
 #define NORETURN_PTR __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#define NORETURN __declspec(noreturn)
+#define NORETURN_PTR
 #else
 #define NORETURN
 #define NORETURN_PTR

-- 
1.6.6
Erik Faye-Lund· Jan 20, 2010, 21:45 UTC · re: Ramsay Jones · lore

Re: [PATCH 4/4] msvc: Add a definition of NORETURN compatible with msvc compiler

On Wed, Jan 20, 2010 at 8:45 PM, Ramsay Jones <ramsay@ramsay1.demon.co.uk> wrote:

Show 11 quoted lines
>
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> ---
>
> I thought that Erik had already submitted this patch along with
> those that resulted in commits a4f3131c and 18660bc9. However, I
> don't seem to be able to find it anywhere! (maybe I only imagined
> it).
>
> If you find Erik's patch, please apply that instead...
>

I don't think I ever sent one - I haven't bothered to set up msvc for git compilation, so I only did the preparation (and I think I sent a comment about how it could be done).

So, thanks for following it up! :)
-- 
Erik "kusma" Faye-Lund
Ramsay Jones· Jan 22, 2010, 19:35 UTC · re: Erik Faye-Lund · lore

Re: [PATCH 4/4] msvc: Add a definition of NORETURN compatible with msvc compiler

Erik Faye-Lund wrote:
Show 15 quoted lines
> On Wed, Jan 20, 2010 at 8:45 PM, Ramsay Jones
> <ramsay@ramsay1.demon.co.uk> wrote:
>> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
>> ---
>>
>> I thought that Erik had already submitted this patch along with
>> those that resulted in commits a4f3131c and 18660bc9. However, I
>> don't seem to be able to find it anywhere! (maybe I only imagined
>> it).
>>
>> If you find Erik's patch, please apply that instead...
> 
> I don't think I ever sent one - I haven't bothered to set up msvc for
> git compilation, so I only did the preparation (and I think I sent a
> comment about how it could be done).

Ah, so maybe it's this comment that I (mis-)remembered then! (yeah, my memory is not what it used to be ;-)). Thanks for doing the preparation work!

ATB, Ramsay Jones

Sebastian Schuberth· Jan 23, 2010, 00:18 UTC · re: Ramsay Jones · lore

Re: [PATCH 4/4] msvc: Add a definition of NORETURN compatible with msvc compiler

On 20.01.2010 20:45, Ramsay Jones wrote:
> Signed-off-by: Ramsay Jones<ramsay@ramsay1.demon.co.uk>
Acked-by: Sebastian Schuberth <sschuberth@gmail.com>
-- 
Sebastian Schuberth

← back to recent threads