diff options
| author | Xin Li <delphij@google.com> | 2024-01-17 22:13:50 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-17 22:13:50 -0800 |
| commit | 50942b5eea84829ae406f8ca35bb1609ad25c83a (patch) | |
| tree | 0c90eb3c77656b536cf21a9c4858dd6a035f597e | |
| parent | 9e82d305b938c9aefd2e9ebc0b20b626d89c49f8 (diff) | |
| parent | 679499cc9b92cfb0ae1dccbfd7e97ce719d23576 (diff) | |
| download | dng_sdk-temp_319669529.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529
Merged-In: Ib25cec45621c4eefc703de5f5e43b16dc0a010a3
Change-Id: I9a955f319169e79ead7e451b71d0573ef90cdf81
| -rw-r--r-- | source/dng_safe_arithmetic.h | 2 |
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)) { |