From 57e41f5c60a55237cf11379f5b5e3043b0dd49f8 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 15 Oct 2019 14:24:44 -0700 Subject: [nativewindow] fix -Wreorder-init-list C++20 will require members in a designated initializer to be in order unlike C99. Bug: 139945549 Test: mm Change-Id: I9af163a79aa97f3b1a7e423614a82c920a09ab17 Signed-off-by: Nick Desaulniers --- libs/nativewindow/AHardwareBuffer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/nativewindow/AHardwareBuffer.cpp') diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp index 9bd30955f3..1ec73ce961 100644 --- a/libs/nativewindow/AHardwareBuffer.cpp +++ b/libs/nativewindow/AHardwareBuffer.cpp @@ -266,10 +266,10 @@ int AHardwareBuffer_sendHandleToUnixSocket(const AHardwareBuffer* buffer, int so char buf[CMSG_SPACE(kFdBufferSize)]; struct msghdr msg = { - .msg_control = buf, - .msg_controllen = sizeof(buf), .msg_iov = &iov[0], .msg_iovlen = 1, + .msg_control = buf, + .msg_controllen = sizeof(buf), }; struct cmsghdr* cmsg = CMSG_FIRSTHDR(&msg); @@ -306,10 +306,10 @@ int AHardwareBuffer_recvHandleFromUnixSocket(int socketFd, AHardwareBuffer** out iov[0].iov_len = kMessageBufferSize; struct msghdr msg = { - .msg_control = fdBuf, - .msg_controllen = sizeof(fdBuf), .msg_iov = &iov[0], .msg_iovlen = 1, + .msg_control = fdBuf, + .msg_controllen = sizeof(fdBuf), }; int result; -- cgit v1.2.3-59-g8ed1b