diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2011-02-21 21:33:54 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2011-02-21 21:33:54 +0000 |
| commit | 4dd920a9aa5a46e6bb69d467c8afa39687621ed9 (patch) | |
| tree | f9d7e19185d4dce2a076fcb42ceeb31b7a575877 /cmakeconfig.h.in | |
| parent | af7e7f1004436bf2193eee5a071d26662be7861c (diff) | |
From Roland Knall:
WS_MSVC_NORETURN is undeclared under a non-Windows operating system, which
breaks compilation in the files epan/except.c and dumpcap.c as well as any
file including epan/except.h
svn path=/trunk/; revision=36023
Diffstat (limited to 'cmakeconfig.h.in')
| -rw-r--r-- | cmakeconfig.h.in | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index d739c42174..720f46140e 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -354,6 +354,15 @@ dynamically-linked libraries */ #define WS_VAR_IMPORT @WS_VAR_IMPORT@ +/* Define WS_MSVC_NORETURN appropriately for declarations of routines that + never return (just like Charlie on the MTA). + + Note that MSVC++ expects __declspec(noreturn) to precede the function + name and GCC, as far as I know, expects __attribute__((noreturn)) to + follow the function name, so we need two different flavors of + noreturn tag. */ +#define WS_MSVC_NORETURN @WS_MSVC_NORETURN@ + /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ /* Note: not use in the code */ |