Chromium Code Reviews| Index: net/spdy/spdy_headers_block_parser.h |
| diff --git a/net/spdy/spdy_headers_block_parser.h b/net/spdy/spdy_headers_block_parser.h |
| index a9dfaa64d44b1f5dbf1e18e5e6dff6ee835e7a3a..f5175cabf3dbbe32d324889930d0fa04c0da7e41 100644 |
| --- a/net/spdy/spdy_headers_block_parser.h |
| +++ b/net/spdy/spdy_headers_block_parser.h |
| @@ -61,7 +61,12 @@ class NET_EXPORT_PRIVATE SpdyHeadersBlockParser { |
| const char* headers_data, |
| size_t len); |
| enum ParserError { |
| - OK, |
| +#if defined(_WIN32) |
| +// On Windows, <WinError.h> defines the NO_ERROR macro as 0L, which |
| +// breaks the compilation of the "NO_ERROR = 0" line. |
| +#undef NO_ERROR |
| +#endif |
| + NO_ERROR, |
|
Ryan Hamilton
2015/01/26 03:51:23
Since this is a bit ugly, consider renaming this t
Bence
2015/01/26 16:48:21
Done.
|
| // Set when parsing failed due to insufficient data. |
| // This error is recoverable, by passing in new data. |
| NEED_MORE_DATA, |