From a26330ac6f82c3e5f79dc63421ee93e806c9065e Mon Sep 17 00:00:00 2001 From: agouaillard Date: Mon, 30 Jan 2017 00:54:19 -0800 Subject: [PATCH] Only define NO_RETURN if undefined WebRTC's NO_RETURN definition conflicts with WebKit's. This can be avoided by only defining it if not already defined. BUG=webrtc:7054 Review-Url: https://codereview.webrtc.org/2657823004 Cr-Commit-Position: refs/heads/master@{#16353} --- webrtc/typedefs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h index 65aa1aded5..16e10c5ea1 100644 --- a/webrtc/typedefs.h +++ b/webrtc/typedefs.h @@ -98,6 +98,7 @@ #endif #endif +#ifndef NO_RETURN // Annotate a function that will not return control flow to the caller. #if defined(_MSC_VER) #define NO_RETURN __declspec(noreturn) @@ -106,5 +107,6 @@ #else #define NO_RETURN #endif +#endif #endif // WEBRTC_TYPEDEFS_H_