libprocess: Placed noreturn attribute correctly for C11. Places bundled libev noreturn attribute correctly for C11.
The bundled libev uses different noreturn attributes based on whether it is compiled with C11 or not. The C11 codepath places the noreturn attribute in an incorrect (but accepted by GCC) location. Move it to the standard location which is accepted by all supported compilers. Review: https://reviews.apache.org/r/32747 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6da1d4ec Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6da1d4ec Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6da1d4ec Branch: refs/heads/master Commit: 6da1d4ec25e7749bae8680ce62cb22b5a73fa047 Parents: 1f97b28 Author: Cody Maloney <[email protected]> Authored: Wed Apr 15 19:46:15 2015 +0200 Committer: Till Toenshoff <[email protected]> Committed: Thu Apr 16 09:54:23 2015 +0200 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/libev-4.15.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6da1d4ec/3rdparty/libprocess/3rdparty/libev-4.15.patch ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/libev-4.15.patch b/3rdparty/libprocess/3rdparty/libev-4.15.patch index 2b94532..bbd83e6 100644 --- a/3rdparty/libprocess/3rdparty/libev-4.15.patch +++ b/3rdparty/libprocess/3rdparty/libev-4.15.patch @@ -9,3 +9,15 @@ diff -rupN libev-4.15/ev.h libev-4.15-patched/ev.h +# define EV_CHILD_ENABLE 0 #endif #endif + +diff -rupN libev-4.15/ev.c libev-4.15-patched/ev.c +--- libev-4.15/ev.c 2013-03-01 03:10:48.000000000 -0800 ++++ libev-4.15-patched/ev.c 2015-03-31 18:32:07.910991755 -0700 +@@ -967,7 +967,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t + #define ecb_unreachable() __builtin_unreachable () + #else + /* this seems to work fine, but gcc always emits a warning for it :/ */ +- ecb_inline void ecb_unreachable (void) ecb_noreturn; ++ ecb_inline ecb_noreturn void ecb_unreachable (void); + ecb_inline void ecb_unreachable (void) { } + #endif
