commit 579f42b78922d8c70e19ea77d2818ec17d0dc6a7
author Elliott Hughes <enh@google.com> Tue Jan 19 17:48:28 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 19 17:48:28 2016 +0000
tree 2df6136520419c7b4fae2046d479250e94f9e728
parent 94ddc29c0ebb0ba8493c070d40efb5d68260982d
parent d1293faba6dbb9aa8a6253d565f8276e819c1453

Merge "Fix GCC build breakage."

libc/bionic/net_if.cpp

diff --git a/libc/bionic/net_if.cpp b/libc/bionic/net_if.cpp
index a6b896e..f8d73bd 100644
--- a/libc/bionic/net_if.cpp
+++ b/libc/bionic/net_if.cpp
@@ -48,7 +48,8 @@
   int s = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0);
   if (s == -1) return nullptr;
 
-  struct ifreq ifr = {};
+  struct ifreq ifr;
+  memset(&ifr, 0, sizeof(ifr));
   ifr.ifr_ifindex = ifindex;
 
   int rc = ioctl(s, SIOCGIFNAME, &ifr);
@@ -61,7 +62,8 @@
   int s = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0);
   if (s == -1) return 0;
 
-  struct ifreq ifr = {};
+  struct ifreq ifr;
+  memset(&ifr, 0, sizeof(ifr));
   strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
   ifr.ifr_name[IFNAMSIZ - 1] = 0;