From f0b7de7cfe2a17df689b067ffee1188f052eec26 Mon Sep 17 00:00:00 2001 From: Amit Sadaphule <58591516+amitsadaphule@users.noreply.github.com> Date: Sat, 20 Jun 2020 04:58:37 +0530 Subject: [PATCH] Fix '//:redis_client' build on RHEL 7.6 ppc64le (#9035) Co-authored-by: Mehrdad --- thirdparty/patches/msgpack-windows-iovec.patch | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/thirdparty/patches/msgpack-windows-iovec.patch b/thirdparty/patches/msgpack-windows-iovec.patch index b4e9261d9..4d961d2be 100644 --- a/thirdparty/patches/msgpack-windows-iovec.patch +++ b/thirdparty/patches/msgpack-windows-iovec.patch @@ -1,11 +1,8 @@ diff --git include/msgpack/v1/vrefbuffer.hpp include/msgpack/v1/vrefbuffer.hpp --- include/msgpack/v1/vrefbuffer.hpp +++ include/msgpack/v1/vrefbuffer.hpp -@@ -28,4 +28,12 @@ --struct iovec { -- void *iov_base; -- size_t iov_len; --}; +@@ -28,4 +28,19 @@ ++#ifdef _WIN32 +#ifndef _WS2DEF_ +#include +#endif @@ -18,6 +15,12 @@ diff --git include/msgpack/v1/vrefbuffer.hpp include/msgpack/v1/vrefbuffer.hpp +#ifndef iov_len +#define iov_len len +#endif ++#else + struct iovec { + void *iov_base; + size_t iov_len; + }; ++#endif @@ -171,1 +179,1 @@ - const_cast((m_tail - 1)->iov_base) + (m_tail - 1)->iov_base