admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only define NO_RETURN if undefined

Browse Source 
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}
This commit is contained in:
agouaillard 2017-01-30 00:54:19 -08:00 committed by Commit bot
parent 2e6048461e
commit a26330ac6f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/typedefs.h
View File

@ -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_