diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2015-05-06 14:40:03 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2015-05-06 14:40:03 +0000 |
| commit | c49905e15c8e9d735e2ddc919d4d373d4b530ea7 (patch) | |
| tree | ac8dd878ffc60efeb8813267d6365dfdf0608d15 /devel | |
| parent | Fix after last commit. (diff) | |
Fix the patch to fix build with clang 3.6, it seems it was applied twice
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/rubygem-cool.io/files/patch-ext__libev__ev.c | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/devel/rubygem-cool.io/files/patch-ext__libev__ev.c b/devel/rubygem-cool.io/files/patch-ext__libev__ev.c index 562e94030773..804914e70926 100644 --- a/devel/rubygem-cool.io/files/patch-ext__libev__ev.c +++ b/devel/rubygem-cool.io/files/patch-ext__libev__ev.c @@ -1,21 +1,18 @@ ---- devel/rubygem-cool.io/files/patch-ext__libev__ev.c (revision 0) -+++ devel/rubygem-cool.io/files/patch-ext__libev__ev.c (working copy) -@@ -0,0 +1,18 @@ -+--- ext/libev/ev.c.orig 2015-02-24 21:12:24.501215000 +0100 -++++ ext/libev/ev.c 2015-02-24 21:16:08.576108000 +0100 -+@@ -967,12 +967,12 @@ -+ } -+ #endif -+ -+-#if ECB_GCC_VERSION(4,5) -++#if ECB_GCC_VERSION(4,5) || defined __clang__ -+ #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 void ecb_unreachable (void) { } -++ ecb_inline void ecb_noreturn ecb_unreachable (void); -++ ecb_inline void ecb_noreturn ecb_unreachable (void) { } -+ #endif -+ -+ /* try to tell the compiler that some condition is definitely true */ +--- ext/libev/ev.c.orig 2015-05-06 14:19:50 UTC ++++ ext/libev/ev.c +@@ -967,12 +967,12 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t + } + #endif + +-#if ECB_GCC_VERSION(4,5) ++#if ECB_GCC_VERSION(4,5) || defined __clang__ + #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 void ecb_unreachable (void) { } ++ ecb_inline void ecb_noreturn ecb_unreachable (void); ++ ecb_inline void ecb_noreturn ecb_unreachable (void) { } + #endif + + /* try to tell the compiler that some condition is definitely true */ |