commit 37a38cab9a357898c4f1bac1c5d9f90e91639233
author Tom Finegan <tomfinegan@google.com> Tue Jan 26 13:37:51 2016 -0800
committer Tom Finegan <tomfinegan@google.com> Tue Jan 26 13:37:51 2016 -0800
tree 702db135a3c243bcfa9aef1d846c42d163611b2a
parent ee0ebbaa6920221ce199b01edaa08f14a2e73267

test_util: Fix gcc build.

Change-Id: I287b8c31f354bbf871d76a4b39109dd711af7b00

testing/test_util.cc

diff --git a/testing/test_util.cc b/testing/test_util.cc
index 43fede6..39a9c4a 100644
--- a/testing/test_util.cc
+++ b/testing/test_util.cc
@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <ios>
 #include <memory>
@@ -48,7 +49,7 @@
     const std::size_t r1 = std::fread(buf1, 1, kBlockSize, f1.get());
     const std::size_t r2 = std::fread(buf2, 1, kBlockSize, f2.get());
 
-    if (r1 != r2 || memcmp(buf1, buf2, r1)) {
+    if (r1 != r2 || std::memcmp(buf1, buf2, r1)) {
       return 0;  // Files are not equal
     }
   } while (!std::feof(f1.get()) && !std::feof(f2.get()));
@@ -65,10 +66,12 @@
 std::uint64_t GetFileSize(const std::string& file_name) {
   std::uint64_t file_size = 0;
 #ifndef _MSC_VER
-  struct stat st = {0};
+  struct stat st;
+  st.st_size = 0;
   if (stat(file_name.c_str(), &st) == 0) {
 #else
-  struct _stat st = {0};
+  struct _stat st;
+  st.st_size = 0;
   if (_stat(file_name.c_str(), &st) == 0) {
 #endif
     file_size = st.st_size;