diff --git a/deps/brotli/c/common/platform.h b/deps/brotli/c/common/platform.h index e1254d5ca2d5..b59f9b8091c2 100644 --- a/deps/brotli/c/common/platform.h +++ b/deps/brotli/c/common/platform.h @@ -213,10 +213,6 @@ To apply compiler hint, enclose the branching condition into macros, like this: #define BROTLI_TARGET_MIPS64 #endif -#if defined(__ia64__) || defined(_M_IA64) -#define BROTLI_TARGET_IA64 -#endif - #if defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \ defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) || \ defined(BROTLI_TARGET_LOONGARCH64) || defined(BROTLI_TARGET_MIPS64) @@ -669,14 +665,13 @@ BROTLI_UNUSED_FUNCTION void BrotliSuppressUnusedFunctions(void) { #undef BROTLI_TEST #endif -#if !defined(BROTLI_MODEL) && BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) && \ - !defined(BROTLI_TARGET_IA64) && !defined(BROTLI_TARGET_LOONGARCH64) +#if BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) #define BROTLI_MODEL(M) __attribute__((model(M))) #else #define BROTLI_MODEL(M) /* M */ #endif -#if !defined(BROTLI_COLD) && BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0) +#if BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0) #define BROTLI_COLD __attribute__((cold)) #else #define BROTLI_COLD /* cold */ diff --git a/deps/brotli/c/common/version.h b/deps/brotli/c/common/version.h index 0d6fcc50a029..720a48f938d5 100644 --- a/deps/brotli/c/common/version.h +++ b/deps/brotli/c/common/version.h @@ -19,7 +19,7 @@ #define BROTLI_VERSION_MAJOR 1 #define BROTLI_VERSION_MINOR 2 -#define BROTLI_VERSION_PATCH 0 +#define BROTLI_VERSION_PATCH 1 #define BROTLI_VERSION BROTLI_MAKE_HEX_VERSION( \ BROTLI_VERSION_MAJOR, BROTLI_VERSION_MINOR, BROTLI_VERSION_PATCH) @@ -33,7 +33,7 @@ */ #define BROTLI_ABI_CURRENT 3 -#define BROTLI_ABI_REVISION 0 +#define BROTLI_ABI_REVISION 1 #define BROTLI_ABI_AGE 2 #if BROTLI_VERSION_MAJOR != (BROTLI_ABI_CURRENT - BROTLI_ABI_AGE) diff --git a/deps/brotli/c/dec/decode.c b/deps/brotli/c/dec/decode.c index 19c7e0283faa..74db1a292b95 100644 --- a/deps/brotli/c/dec/decode.c +++ b/deps/brotli/c/dec/decode.c @@ -1317,7 +1317,7 @@ DecodeDistanceBlockSwitch(BrotliDecoderState* s) { return DecodeDistanceBlockSwitchInternal(0, s); } -static BROTLI_BOOL BROTLI_NOINLINE SafeDecodeDistanceBlockSwitch( +static BROTLI_NOINLINE BrotliDecoderErrorCode SafeDecodeDistanceBlockSwitch( BrotliDecoderState* s) { return DecodeDistanceBlockSwitchInternal(1, s); }