Skip to content

Commit

Permalink
Fix MSVC compilation (#657)
Browse files Browse the repository at this point in the history
 * tell bazel not to pass strict options to a fancy compiler
 * fix signed-unsigned comparison warning found by MSVC
  • Loading branch information
eustas authored Mar 29, 2018
1 parent 0f3c84e commit c6333e1
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 16 deletions.
35 changes: 22 additions & 13 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -73,19 +79,22 @@ cc_library(

# <<< JNI headers

STRICT_C_OPTIONS = [
"--pedantic-errors",
"-Wall",
"-Wconversion",
"-Werror",
"-Wextra",
"-Wlong-long",
"-Wmissing-declarations",
"-Wmissing-prototypes",
"-Wno-strict-aliasing",
"-Wshadow",
"-Wsign-compare",
]
STRICT_C_OPTIONS = select({
":msvc": [],
"//conditions:default": [
"--pedantic-errors",
"-Wall",
"-Wconversion",
"-Werror",
"-Wextra",
"-Wlong-long",
"-Wmissing-declarations",
"-Wmissing-prototypes",
"-Wno-strict-aliasing",
"-Wshadow",
"-Wsign-compare",
],
})

filegroup(
name = "public_headers",
Expand Down
6 changes: 3 additions & 3 deletions c/enc/command.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c6333e1

Please sign in to comment.