diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-04-28 14:37:17 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-04-28 14:37:17 -0700 |
| commit | 81aae44858dc72a55461486d9ea192db25f4b890 (patch) | |
| tree | 2af2da81809a005a12e175f40b772f45f40bdff8 /src | |
| parent | 365c52b47e8d322dfc0bdf15ddea2b598f3b4dbb (diff) | |
| parent | dc36f4df6aba60275a31227e1d29c4d20b6cadca (diff) | |
Merge branch 'v1.3.x' into master-upmerge-v1.3.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/iomgr/port.h | 1 | ||||
| -rw-r--r-- | src/core/lib/support/cpu_linux.c | 8 | ||||
| -rw-r--r-- | src/core/lib/support/wrap_memcpy.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/core/lib/iomgr/port.h b/src/core/lib/iomgr/port.h index 269dc35003..2a553f4114 100644 --- a/src/core/lib/iomgr/port.h +++ b/src/core/lib/iomgr/port.h @@ -88,6 +88,7 @@ #ifndef __GLIBC__ #define GRPC_LINUX_EPOLL 1 #define GRPC_LINUX_EVENTFD 1 +#define GRPC_MSG_IOVLEN_TYPE int #endif #ifndef GRPC_LINUX_EVENTFD #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1 diff --git a/src/core/lib/support/cpu_linux.c b/src/core/lib/support/cpu_linux.c index 1e50f59823..b826dde160 100644 --- a/src/core/lib/support/cpu_linux.c +++ b/src/core/lib/support/cpu_linux.c @@ -67,16 +67,16 @@ unsigned gpr_cpu_num_cores(void) { } unsigned gpr_cpu_current_cpu(void) { -#ifdef __GLIBC__ +#ifdef GPR_MUSL_LIBC_COMPAT + // sched_getcpu() is undefined on musl + return 0; +#else int cpu = sched_getcpu(); if (cpu < 0) { gpr_log(GPR_ERROR, "Error determining current CPU: %s\n", strerror(errno)); return 0; } return (unsigned)cpu; -#else - // sched_getcpu() is undefined on musl - return 0; #endif } diff --git a/src/core/lib/support/wrap_memcpy.c b/src/core/lib/support/wrap_memcpy.c index 050cc6db5e..deb8d6b198 100644 --- a/src/core/lib/support/wrap_memcpy.c +++ b/src/core/lib/support/wrap_memcpy.c @@ -31,6 +31,8 @@ * */ +#include <grpc/support/port_platform.h> + #include <string.h> /* Provide a wrapped memcpy for targets that need to be backwards @@ -40,7 +42,7 @@ */ #ifdef __linux__ -#if defined(__x86_64__) && defined(__GNU_LIBRARY__) +#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); void *__wrap_memcpy(void *destination, const void *source, size_t num) { return memcpy(destination, source, num); |