| 1 | diff -u -r ../libuv-v1.9.1/src/unix/internal.h ./src/unix/internal.h |
| 2 | --- ../libuv-v1.9.1/src/unix/internal.h 2016-05-16 17:22:19.000000000 -0400 |
| 3 | +++ ./src/unix/internal.h 2016-05-18 10:48:45.456553752 -0400 |
| 4 | @@ -55,14 +55,6 @@ |
| 5 | # include <CoreServices/CoreServices.h> |
| 6 | #endif |
| 7 | |
| 8 | -#if defined(__ANDROID__) |
| 9 | -int uv__pthread_sigmask(int how, const sigset_t* set, sigset_t* oset); |
| 10 | -# ifdef pthread_sigmask |
| 11 | -# undef pthread_sigmask |
| 12 | -# endif |
| 13 | -# define pthread_sigmask(how, set, oldset) uv__pthread_sigmask(how, set, oldset) |
| 14 | -#endif |
| 15 | - |
| 16 | #define ACCESS_ONCE(type, var) \ |
| 17 | (*(volatile type*) &(var)) |
| 18 | |
| 19 | diff -u -r ../libuv-v1.9.1/src/unix/pthread-fixes.c ./src/unix/pthread-fixes.c |
| 20 | --- ../libuv-v1.9.1/src/unix/pthread-fixes.c 2016-05-16 17:22:19.000000000 -0400 |
| 21 | +++ ./src/unix/pthread-fixes.c 2016-05-18 10:47:54.209328719 -0400 |
| 22 | @@ -33,24 +33,3 @@ |
| 23 | #include <errno.h> |
| 24 | #include <pthread.h> |
| 25 | #include <signal.h> |
| 26 | - |
| 27 | -int uv__pthread_sigmask(int how, const sigset_t* set, sigset_t* oset) { |
| 28 | - static int workaround; |
| 29 | - int err; |
| 30 | - |
| 31 | - if (workaround) { |
| 32 | - return sigprocmask(how, set, oset); |
| 33 | - } else { |
| 34 | - err = pthread_sigmask(how, set, oset); |
| 35 | - if (err) { |
| 36 | - if (err == EINVAL && sigprocmask(how, set, oset) == 0) { |
| 37 | - workaround = 1; |
| 38 | - return 0; |
| 39 | - } else { |
| 40 | - return -1; |
| 41 | - } |
| 42 | - } |
| 43 | - } |
| 44 | - |
| 45 | - return 0; |
| 46 | -} |