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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36023 f5534014-38df-0310-8fa8-9805f1628bb7

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 */