#define BROTLI_ENC_ENTROPY_ENCODE_STATIC_H_\r
\r
#include "../common/constants.h"\r
-#include "../common/port.h"\r
-#include "../common/types.h"\r
+#include "../common/platform.h"\r
+#include <brotli/types.h>\r
#include "./write_bits.h"\r
\r
#if defined(__cplusplus) || defined(c_plusplus)\r
static BROTLI_INLINE void StoreStaticCodeLengthCode(\r
size_t* storage_ix, uint8_t* storage) {\r
BrotliWriteBits(\r
- 40, MAKE_UINT64_T(0x0000ffU, 0x55555554U), storage_ix, storage);\r
+ 40, BROTLI_MAKE_UINT64_T(0x0000FFu, 0x55555554u), storage_ix, storage);\r
}\r
\r
static const uint64_t kZeroRepsBits[BROTLI_NUM_COMMAND_SYMBOLS] = {\r
static BROTLI_INLINE void StoreStaticCommandHuffmanTree(\r
size_t* storage_ix, uint8_t* storage) {\r
BrotliWriteBits(\r
- 56, MAKE_UINT64_T(0x926244U, 0x16307003U), storage_ix, storage);\r
+ 56, BROTLI_MAKE_UINT64_T(0x926244U, 0x16307003U), storage_ix, storage);\r
BrotliWriteBits(3, 0x00000000U, storage_ix, storage);\r
}\r
\r
\r
static BROTLI_INLINE void StoreStaticDistanceHuffmanTree(\r
size_t* storage_ix, uint8_t* storage) {\r
- BrotliWriteBits(28, 0x0369dc03U, storage_ix, storage);\r
+ BrotliWriteBits(28, 0x0369DC03u, storage_ix, storage);\r
}\r
\r
#if defined(__cplusplus) || defined(c_plusplus)\r