From d359a9f922af840b043535d43cf9d38b220d102e Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 30 Jan 2024 14:39:06 +0100 Subject: [PATCH] Correctly check the TARGET_IPHONE_SIMULATOR macro The macro may be defined to 0; the code needs to check the value, not just whether it's defined. Recent Clang versions will define all Apple "target OS" macros by default (see bug). Bug: chromium:1519899 Change-Id: I3d61f1b23de06d7db7db7916182a789f26345bce Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5249072 Commit-Queue: Frank Barchard Reviewed-by: Frank Barchard --- source/mjpeg_decoder.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc index 0141da8a1..66b18b7be 100644 --- a/source/mjpeg_decoder.cc +++ b/source/mjpeg_decoder.cc @@ -13,8 +13,12 @@ #ifdef HAVE_JPEG #include +#if !defined(TARGET_IPHONE_SIMULATOR) +#define TARGET_IPHONE_SIMULATOR 0 +#endif + #if !defined(__pnacl__) && !defined(__CLR_VER) && \ - !defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR) + !defined(COVERAGE_ENABLED) && !TARGET_IPHONE_SIMULATOR // Must be included before jpeglib. #include #define HAVE_SETJMP