mirror of
https://github.com/google/brotli.git
synced 2024-11-09 13:40:06 +00:00
Fix MSVC compilation (#657)
* tell bazel not to pass strict options to a fancy compiler * fix signed-unsigned comparison warning found by MSVC
This commit is contained in:
parent
0f3c84e745
commit
c6333e1e79
13
BUILD
13
BUILD
@ -41,6 +41,12 @@ config_setting(
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
config_setting(
|
||||
name = "msvc",
|
||||
values = {"compiler": "msvc-cl"},
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
genrule(
|
||||
name = "copy_link_jni_header",
|
||||
srcs = ["@openjdk_linux//:jni_h"],
|
||||
@ -73,7 +79,9 @@ cc_library(
|
||||
|
||||
# <<< JNI headers
|
||||
|
||||
STRICT_C_OPTIONS = [
|
||||
STRICT_C_OPTIONS = select({
|
||||
":msvc": [],
|
||||
"//conditions:default": [
|
||||
"--pedantic-errors",
|
||||
"-Wall",
|
||||
"-Wconversion",
|
||||
@ -85,7 +93,8 @@ STRICT_C_OPTIONS = [
|
||||
"-Wno-strict-aliasing",
|
||||
"-Wshadow",
|
||||
"-Wsign-compare",
|
||||
]
|
||||
],
|
||||
})
|
||||
|
||||
filegroup(
|
||||
name = "public_headers",
|
||||
|
@ -145,11 +145,11 @@ static BROTLI_INLINE void InitInsertCommand(Command* self, size_t insertlen) {
|
||||
|
||||
static BROTLI_INLINE uint32_t CommandRestoreDistanceCode(
|
||||
const Command* self, const BrotliDistanceParams* dist) {
|
||||
if ((self->dist_prefix_ & 0x3FF) <
|
||||
if ((self->dist_prefix_ & 0x3FFu) <
|
||||
BROTLI_NUM_DISTANCE_SHORT_CODES + dist->num_direct_distance_codes) {
|
||||
return self->dist_prefix_ & 0x3FF;
|
||||
return self->dist_prefix_ & 0x3FFu;
|
||||
} else {
|
||||
uint32_t dcode = self->dist_prefix_ & 0x3FF;
|
||||
uint32_t dcode = self->dist_prefix_ & 0x3FFu;
|
||||
uint32_t nbits = self->dist_prefix_ >> 10;
|
||||
uint32_t extra = self->dist_extra_;
|
||||
uint32_t postfix_mask = (1U << dist->distance_postfix_bits) - 1U;
|
||||
|
Loading…
Reference in New Issue
Block a user