\r
#include "./bit_reader.h"\r
\r
-#include "../common/types.h"\r
-#include "./port.h"\r
+#include "../common/platform.h"\r
+#include <brotli/types.h>\r
\r
#if defined(__cplusplus) || defined(c_plusplus)\r
extern "C" {\r
size_t aligned_read_mask = (sizeof(br->val_) >> 1) - 1;\r
/* Fixing alignment after unaligned BrotliFillWindow would result accumulator\r
overflow. If unalignment is caused by BrotliSafeReadBits, then there is\r
- enough space in accumulator to fix aligment. */\r
+ enough space in accumulator to fix alignment. */\r
if (!BROTLI_ALIGNED_READ) {\r
aligned_read_mask = 0;\r
}\r
}\r
}\r
\r
- while ((((size_t)br->next_in) & aligned_read_mask) != 0) {\r
+ while ((((size_t)(*br->next_in)) & aligned_read_mask) != 0) {\r
if (!BrotliPullByte(br)) {\r
/* If we consumed all the input, we don't care about the alignment. */\r
return BROTLI_TRUE;\r