summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-03-12 23:02:56 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-03-12 23:02:56 +0000
commit7f29891940aae34f9631a45e0557763af716bf61 (patch)
tree0c90eb3c77656b536cf21a9c4858dd6a035f597e
parent5ab4a5dca8d38399bad8cf8da93151eb83cf2ab9 (diff)
parent88706c9ecb1d4260dbf9803cd31a61d0152c996a (diff)
downloaddng_sdk-sdk-release.tar.gz
Snap for 11566117 from 88706c9ecb1d4260dbf9803cd31a61d0152c996a to sdk-releaseplatform-tools-35.0.1sdk-release
Change-Id: I99cd4ad0d52d22f6f610e49055cd518d3b8b30f4
-rw-r--r--source/dng_safe_arithmetic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/dng_safe_arithmetic.h b/source/dng_safe_arithmetic.h
index 66c5ebf..268c918 100644
--- a/source/dng_safe_arithmetic.h
+++ b/source/dng_safe_arithmetic.h
@@ -113,7 +113,7 @@ std::int64_t SafeInt64MultSlow(std::int64_t arg1, std::int64_t arg2);
#if __has_builtin(__builtin_smull_overflow)
inline std::int64_t SafeInt64MultByClang(std::int64_t arg1, std::int64_t arg2) {
std::int64_t result;
-#if LONG_MAX == INT64_MAX
+#if (LONG_MAX == INT64_MAX) && !defined(__APPLE__)
if (__builtin_smull_overflow(arg1, arg2, &result)) {
#else
if (__builtin_smulll_overflow(arg1, arg2, &result)) {