summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/flac
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2025-05-13 11:41:23 +0700
committer Patrick Mackinlay <pmackinlay@hotmail.com>2025-05-13 11:41:23 +0700
commitcb045de3d24aa0db995919e46ec50a5e8d788509 (patch)
treecad7b8ff4244f54d3b93ba914c17292771bcd39e /3rdparty/flac
parentda468a4f50d1f06837e1bce38b12475f4693471d (diff)
3rdparty: cherry-pick upstream fixes for clangcl
Diffstat (limited to '3rdparty/flac')
-rw-r--r--3rdparty/flac/src/libFLAC/include/private/bitmath.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/3rdparty/flac/src/libFLAC/include/private/bitmath.h b/3rdparty/flac/src/libFLAC/include/private/bitmath.h
index 12e062f88c5..5241462f378 100644
--- a/3rdparty/flac/src/libFLAC/include/private/bitmath.h
+++ b/3rdparty/flac/src/libFLAC/include/private/bitmath.h
@@ -1,6 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
* Copyright (C) 2001-2009 Josh Coalson
- * Copyright (C) 2011-2023 Xiph.Org Foundation
+ * Copyright (C) 2011-2025 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -82,7 +82,7 @@ static inline uint32_t FLAC__clz_uint32(FLAC__uint32 v)
return __builtin_clz(v);
#elif defined(_MSC_VER)
{
- uint32_t idx;
+ unsigned long idx;
_BitScanReverse(&idx, v);
return idx ^ 31U;
}
@@ -106,7 +106,7 @@ static inline uint32_t FLAC__clz_uint64(FLAC__uint64 v)
return __builtin_clzll(v);
#elif (defined(__INTEL_COMPILER) || defined(_MSC_VER)) && (defined(_M_IA64) || defined(_M_X64))
{
- uint32_t idx;
+ unsigned long idx;
_BitScanReverse64(&idx, v);
return idx ^ 63U;
}
@@ -160,7 +160,7 @@ static inline uint32_t FLAC__bitmath_ilog2(FLAC__uint32 v)
return _bit_scan_reverse(v);
#elif defined(_MSC_VER)
{
- uint32_t idx;
+ unsigned long idx;
_BitScanReverse(&idx, v);
return idx;
}
@@ -177,7 +177,7 @@ static inline uint32_t FLAC__bitmath_ilog2_wide(FLAC__uint64 v)
/* Sorry, only supported in x64/Itanium.. and both have fast FPU which makes integer-only encoder pointless */
#elif (defined(__INTEL_COMPILER) || defined(_MSC_VER)) && (defined(_M_IA64) || defined(_M_X64))
{
- uint32_t idx;
+ unsigned long idx;
_BitScanReverse64(&idx, v);
return idx;
}
@@ -206,5 +206,6 @@ static inline uint32_t FLAC__bitmath_ilog2_wide(FLAC__uint64 v)
}
uint32_t FLAC__bitmath_silog2(FLAC__int64 v);
+uint32_t FLAC__bitmath_extra_mulbits_unsigned(FLAC__uint32 v);
#endif