commit 5abb89b35e3c392d46e966001bb26f40a1590d4c
author ianswett <ianswett@google.com> Mon Apr 13 14:48:51 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 13 14:49:27 2020 -0700
tree 4699be074f484b1e759ae1e99427b3cfbbc6de97
parent e71fb0baad939a4dfc54c23437ad75a970100ccc

gfe-relnote: Rename QuicHttp3ErrorCode::NO_ERROR to HTTP3_NO_ERROR to avoid colliding with the Windows NO_ERROR error code.  No functional change, not flag protected.

PiperOrigin-RevId: 306313912
Change-Id: Ifd425dfd669b6b3bfffe6b803baa0ad4f439f030

quic/core/quic_error_codes.cc

diff --git a/quic/core/quic_error_codes.cc b/quic/core/quic_error_codes.cc
index a559feb..efbdc69 100644
--- a/quic/core/quic_error_codes.cc
+++ b/quic/core/quic_error_codes.cc
@@ -602,7 +602,7 @@
     QuicRstStreamErrorCode rst_stream_error_code) {
   switch (rst_stream_error_code) {
     case QUIC_STREAM_NO_ERROR:
-      return static_cast<uint64_t>(QuicHttp3ErrorCode::NO_ERROR);
+      return static_cast<uint64_t>(QuicHttp3ErrorCode::HTTP3_NO_ERROR);
     case QUIC_ERROR_PROCESSING_STREAM:
       return static_cast<uint64_t>(QuicHttp3ErrorCode::GENERAL_PROTOCOL_ERROR);
     case QUIC_MULTIPLE_TERMINATION_OFFSETS:
@@ -616,7 +616,7 @@
     case QUIC_STREAM_CANCELLED:
       return static_cast<uint64_t>(QuicHttp3ErrorCode::REQUEST_CANCELLED);
     case QUIC_RST_ACKNOWLEDGEMENT:
-      return static_cast<uint64_t>(QuicHttp3ErrorCode::NO_ERROR);
+      return static_cast<uint64_t>(QuicHttp3ErrorCode::HTTP3_NO_ERROR);
     case QUIC_REFUSED_STREAM:
       return static_cast<uint64_t>(QuicHttp3ErrorCode::ID_ERROR);
     case QUIC_INVALID_PROMISE_URL:
@@ -687,7 +687,7 @@
 QuicRstStreamErrorCode IetfResetStreamErrorCodeToRstStreamErrorCode(
     uint64_t ietf_error_code) {
   switch (ietf_error_code) {
-    case static_cast<uint64_t>(QuicHttp3ErrorCode::NO_ERROR):
+    case static_cast<uint64_t>(QuicHttp3ErrorCode::HTTP3_NO_ERROR):
       return QUIC_STREAM_NO_ERROR;
     case static_cast<uint64_t>(QuicHttp3ErrorCode::GENERAL_PROTOCOL_ERROR):
       return QUIC_STREAM_GENERAL_PROTOCOL_ERROR;

quic/core/quic_error_codes.h

diff --git a/quic/core/quic_error_codes.h b/quic/core/quic_error_codes.h
index 85245c8..b878de7 100644
--- a/quic/core/quic_error_codes.h
+++ b/quic/core/quic_error_codes.h
@@ -520,7 +520,8 @@
 // Wire values for HTTP/3 errors.
 // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#http-error-codes
 enum class QuicHttp3ErrorCode {
-  NO_ERROR = 0x100,
+  // NO_ERROR is defined as a C preprocessor macro on Windows.
+  HTTP3_NO_ERROR = 0x100,
   GENERAL_PROTOCOL_ERROR = 0x101,
   INTERNAL_ERROR = 0x102,
   STREAM_CREATION_ERROR = 0x103,