From: Patrick Monnerat <patrick@monnerat.net>
Date: Wed, 20 Dec 2017 14:30:35 +0000 (+0100)
Subject: brotli: allow compiling with version 0.6.0.
X-Git-Tag: curl-7_58_0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e639d4ca4d794c222dde4680d9ff35053f501042;p=thirdparty%2Fcurl.git

brotli: allow compiling with version 0.6.0.

Some error codes were not yet defined in brotli 0.6.0: do not issue code
for them in this case.
---

diff --git a/lib/content_encoding.c b/lib/content_encoding.c
index 3d061375c5..c2ba269720 100644
--- a/lib/content_encoding.c
+++ b/lib/content_encoding.c
@@ -546,8 +546,12 @@ static CURLcode brotli_map_error(BrotliDecoderErrorCode be)
   case BROTLI_DECODER_ERROR_FORMAT_WINDOW_BITS:
   case BROTLI_DECODER_ERROR_FORMAT_PADDING_1:
   case BROTLI_DECODER_ERROR_FORMAT_PADDING_2:
+#ifdef BROTLI_DECODER_ERROR_COMPOUND_DICTIONARY
   case BROTLI_DECODER_ERROR_COMPOUND_DICTIONARY:
+#endif
+#ifdef BROTLI_DECODER_ERROR_DICTIONARY_NOT_SET
   case BROTLI_DECODER_ERROR_DICTIONARY_NOT_SET:
+#endif
   case BROTLI_DECODER_ERROR_INVALID_ARGUMENTS:
     return CURLE_BAD_CONTENT_ENCODING;
   case BROTLI_DECODER_ERROR_ALLOC_CONTEXT_MODES: