summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-03-06 09:29:52 -0800
committerXin Li <delphij@google.com>2024-03-06 09:29:52 -0800
commit88706c9ecb1d4260dbf9803cd31a61d0152c996a (patch)
tree0c90eb3c77656b536cf21a9c4858dd6a035f597e
parent9e82d305b938c9aefd2e9ebc0b20b626d89c49f8 (diff)
parent50942b5eea84829ae406f8ca35bb1609ad25c83a (diff)
downloaddng_sdk-88706c9ecb1d4260dbf9803cd31a61d0152c996a.tar.gz
Merge Android 14 QPR2 to AOSP mainHEADmastermain
Bug: 319669529 Merged-In: I9a955f319169e79ead7e451b71d0573ef90cdf81 Change-Id: I722bb12142975d38e544816f852fffa452959916
-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)) {