Merge branch 'master' into mailnews-work

1 files changed, 7 insertions, 7 deletions

diff --git a/modules/brotli/dec/bit_reader.c b/modules/brotli/dec/bit_reader.c
index cde90af56..722fd906d 100644
--- a/modules/brotli/dec/bit_reader.c
+++ b/modules/brotli/dec/bit_reader.c
@@ -8,8 +8,8 @@
 
 #include "./bit_reader.h"
 
-#include "./port.h"
-#include "./types.h"
+#include "../common/platform.h"
+#include <brotli/types.h>
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -20,27 +20,27 @@ void BrotliInitBitReader(BrotliBitReader* const br) {
   br->bit_pos_ = sizeof(br->val_) << 3;
 }
 
-int BrotliWarmupBitReader(BrotliBitReader* const br) {
+BROTLI_BOOL BrotliWarmupBitReader(BrotliBitReader* const br) {
   size_t aligned_read_mask = (sizeof(br->val_) >> 1) - 1;
   /* Fixing alignment after unaligned BrotliFillWindow would result accumulator
      overflow. If unalignment is caused by BrotliSafeReadBits, then there is
-     enough space in accumulator to fix aligment. */
+     enough space in accumulator to fix alignment. */
   if (!BROTLI_ALIGNED_READ) {
     aligned_read_mask = 0;
   }
   if (BrotliGetAvailableBits(br) == 0) {
     if (!BrotliPullByte(br)) {
-      return 0;
+      return BROTLI_FALSE;
     }
   }
 
   while ((((size_t)br->next_in) & aligned_read_mask) != 0) {
     if (!BrotliPullByte(br)) {
       /* If we consumed all the input, we don't care about the alignment. */
-      return 1;
+      return BROTLI_TRUE;
     }
   }
-  return 1;
+  return BROTLI_TRUE;
 }
 
 #if defined(__cplusplus) || defined(c_plusplus)