Define the VPX_NO_RETURN macro for MSVC

Define VPX_NO_RETURN as __declspec(noreturn) for MSVC. See https://docs.microsoft.com/en-us/cpp/cpp/noreturn?view=msvc-160 This requires moving VPX_NO_RETURN before function declarations because __declspec(noreturn) must be placed there. Fortunately GCC's __attribute__((noreturn)) can be placed either before or after function declarations.

Wan-Teh Chang committed 5 years ago

Commit 8a6fbc01 parent 65a17512 files · +10 −6Browse files

Unified · Split

2 files

args.c +4 −2
tools_common.h +6 −4

args.c+4−2

 #include "vpx/vpx_integer.h"
 #include "vpx_ports/msvc.h"
-#if defined(__GNUC__) && __GNUC__
+#if defined(__GNUC__)
-extern void die(const char *fmt, ...) __attribute__((noreturn));
+__attribute__((noreturn)) extern void die(const char *fmt, ...);
+#elif defined(_MSC_VER)
+__declspec(noreturn) extern void die(const char *fmt, ...);
 #else
 extern void die(const char *fmt, ...);
 #endif

tools_common.h+6−4

 #if defined(__GNUC__)
 #define VPX_NO_RETURN __attribute__((noreturn))
+#elif defined(_MSC_VER)
+#define VPX_NO_RETURN __declspec(noreturn)
 #else
 #define VPX_NO_RETURN
 #endif
 /* Sets a stdio stream into binary mode */
 FILE *set_binary_mode(FILE *stream);
-void die(const char *fmt, ...) VPX_NO_RETURN;
+VPX_NO_RETURN void die(const char *fmt, ...);
-void fatal(const char *fmt, ...) VPX_NO_RETURN;
+VPX_NO_RETURN void fatal(const char *fmt, ...);
 void warn(const char *fmt, ...);
-void die_codec(vpx_codec_ctx_t *ctx, const char *s) VPX_NO_RETURN;
+VPX_NO_RETURN void die_codec(vpx_codec_ctx_t *ctx, const char *s);
 /* The tool including this file must define usage_exit() */
-void usage_exit(void) VPX_NO_RETURN;
+VPX_NO_RETURN void usage_exit(void);
 #undef VPX_NO_RETURN

Define the VPX_NO_RETURN macro for MSVC

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code