commit 6971b06a6d055af240b835b4a932afb63567dcc0
author Christopher Ferris <cferris@google.com> Mon Feb 27 20:17:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 27 20:17:14 2017 +0000
tree cd07c9972c45f9b8f03c4561f9931087ad27b08f
parent 17ba71dadd0b2195f4866aa0e2aa7e6b943a7dae
parent dcb18612576aeb59fbd8ba066b1b7a3a7bca8490

Disable macro redefined warnings on some includes.
am: dcb1861257

Change-Id: I778851869df789ef685216fcc3ccadcc8bfacd9d

payload_generator/delta_diff_utils.cc

diff --git a/payload_generator/delta_diff_utils.cc b/payload_generator/delta_diff_utils.cc
index 80c0287..44aff7a 100644
--- a/payload_generator/delta_diff_utils.cc
+++ b/payload_generator/delta_diff_utils.cc
@@ -17,7 +17,12 @@
 #include "update_engine/payload_generator/delta_diff_utils.h"
 
 #include <endian.h>
+// TODO: Remove these pragmas when b/35721782 is fixed.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmacro-redefined"
 #include <ext2fs/ext2fs.h>
+#pragma clang diagnostic pop
+
 
 #include <algorithm>
 #include <map>

payload_generator/ext2_filesystem.cc

diff --git a/payload_generator/ext2_filesystem.cc b/payload_generator/ext2_filesystem.cc
index b452b41..ee2f8c2 100644
--- a/payload_generator/ext2_filesystem.cc
+++ b/payload_generator/ext2_filesystem.cc
@@ -17,8 +17,12 @@
 #include "update_engine/payload_generator/ext2_filesystem.h"
 
 #include <et/com_err.h>
+// TODO: Remove these pragmas when b/35721782 is fixed.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmacro-redefined"
 #include <ext2fs/ext2_io.h>
 #include <ext2fs/ext2fs.h>
+#pragma clang diagnostic pop
 
 #include <map>
 #include <set>

payload_generator/ext2_filesystem.h

diff --git a/payload_generator/ext2_filesystem.h b/payload_generator/ext2_filesystem.h
index 248e208..1a4e1a1 100644
--- a/payload_generator/ext2_filesystem.h
+++ b/payload_generator/ext2_filesystem.h
@@ -23,7 +23,11 @@
 #include <string>
 #include <vector>
 
+// TODO: Remove these pragmas when b/35721782 is fixed.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmacro-redefined"
 #include <ext2fs/ext2fs.h>
+#pragma clang diagnostic pop
 
 namespace chromeos_update_engine {