commit 57e41f5c60a55237cf11379f5b5e3043b0dd49f8
author Nick Desaulniers <ndesaulniers@google.com> Tue Oct 15 14:24:44 2019 -0700
committer Nick Desaulniers <ndesaulniers@google.com> Wed Oct 16 03:31:27 2019 +0000
tree 26bf9a40b4109f9e3518e91804e815ebe3e7bdb1
parent 1ed80f45a6622256906b29c8e0468d1ece527ee8

[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 <ndesaulniers@google.com>

libs/nativewindow/AHardwareBuffer.cpp

diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp
index 9bd3095..1ec73ce 100644
--- a/libs/nativewindow/AHardwareBuffer.cpp
+++ b/libs/nativewindow/AHardwareBuffer.cpp
@@ -266,10 +266,10 @@
 
     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 @@
     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;