Resolve ENDPOINT macro conflict (net/)
The macro ENDPOINT is defined inside namespaces in:
net/third_party/quic/core/quic_connection.cc
net/third_party/quic/core/quic_crypto_handshaker.cc
net/third_party/quic/core/quic_crypto_stream.cc
net/third_party/quic/core/quic_data_reader.cc
net/third_party/quic/core/quic_framer.cc
net/third_party/quic/core/quic_packet_creator.cc
net/third_party/quic/core/quic_sent_packet_manager.cc
net/third_party/quic/core/quic_session.cc
net/third_party/quic/core/quic_spdy_stream.cc
When building using jumbo these end up in the same
namspace and conflict. This commit solves the issue
by undefining the macro inside the namespace.
Bug: 772146
Change-Id: Ie85920ac632dd90402afc2276ed30fff8609d9be
Reviewed-on: https://chromium-review.googlesource.com/1118220
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#571418}diff --git a/net/third_party/quic/core/quic_connection.cc b/net/third_party/quic/core/quic_connection.cc
index be7a3f7..94393e0 100644
--- a/net/third_party/quic/core/quic_connection.cc
+++ b/net/third_party/quic/core/quic_connection.cc
@@ -3285,4 +3285,5 @@
QuicTime::Delta::Zero());
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_crypto_handshaker.cc b/net/third_party/quic/core/quic_crypto_handshaker.cc
index 46dcd2e..5ee6c654 100644
--- a/net/third_party/quic/core/quic_crypto_handshaker.cc
+++ b/net/third_party/quic/core/quic_crypto_handshaker.cc
@@ -47,4 +47,5 @@
return &crypto_framer_;
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_crypto_stream.cc b/net/third_party/quic/core/quic_crypto_stream.cc
index 43afa88..195aba2 100644
--- a/net/third_party/quic/core/quic_crypto_stream.cc
+++ b/net/third_party/quic/core/quic_crypto_stream.cc
@@ -202,4 +202,5 @@
return true;
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_data_reader.cc b/net/third_party/quic/core/quic_data_reader.cc
index 803cd73..a69bd9d 100644
--- a/net/third_party/quic/core/quic_data_reader.cc
+++ b/net/third_party/quic/core/quic_data_reader.cc
@@ -287,4 +287,5 @@
QuicTextUtils::HexDump(QuicStringPiece(data_, len_)), " }");
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_framer.cc b/net/third_party/quic/core/quic_framer.cc
index 9dbce4ea..60e6f1d8 100644
--- a/net/third_party/quic/core/quic_framer.cc
+++ b/net/third_party/quic/core/quic_framer.cc
@@ -4665,4 +4665,5 @@
return str;
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_packet_creator.cc b/net/third_party/quic/core/quic_packet_creator.cc
index 992526d..3399245 100644
--- a/net/third_party/quic/core/quic_packet_creator.cc
+++ b/net/third_party/quic/core/quic_packet_creator.cc
@@ -743,4 +743,5 @@
packet_.encryption_level < ENCRYPTION_FORWARD_SECURE;
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_sent_packet_manager.cc b/net/third_party/quic/core/quic_sent_packet_manager.cc
index 209b63f..f1f2fc5 100644
--- a/net/third_party/quic/core/quic_sent_packet_manager.cc
+++ b/net/third_party/quic/core/quic_sent_packet_manager.cc
@@ -1170,4 +1170,5 @@
rtt_stats_.set_initial_rtt(std::max(min_rtt, std::min(max_rtt, rtt)));
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_session.cc b/net/third_party/quic/core/quic_session.cc
index 20d5cb6..5c4701e 100644
--- a/net/third_party/quic/core/quic_session.cc
+++ b/net/third_party/quic/core/quic_session.cc
@@ -1204,4 +1204,5 @@
return connection_->session_decides_what_to_write();
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
diff --git a/net/third_party/quic/core/quic_spdy_stream.cc b/net/third_party/quic/core/quic_spdy_stream.cc
index 6550d24..1799100 100644
--- a/net/third_party/quic/core/quic_spdy_stream.cc
+++ b/net/third_party/quic/core/quic_spdy_stream.cc
@@ -302,4 +302,5 @@
spdy_session_ = nullptr;
}
+#undef ENDPOINT // undef for jumbo builds
} // namespace quic
