mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2025-12-06 16:56:55 +08:00
Drop TARGET_IPHONE_SIMULATOR macro check
Recent versions of Clang always define these TARGET_ macros (to 0 or 1 as appropriate) for Apple targets. https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5249072 made the code correctly check the *value* of the macro rather than whether it was defined or not. However, the code was still broken when actually targeting the iOS simulator (where the macro is now 1). It seems the use of this macro was just incorrect, and the code only worked since it was never defined at all. The original use of the macro in this file was added in2c8108e6c2but it 's not quite clear to me why. All other uses have subsequently been removed, e.g. in6a1d01220athis removes the last instance, and should fix the iOS simulator builds. Bug: chromium:1519899 Change-Id: Iaf44d2c37086f1153096044df5d9b61797f66a4f Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5272224 Commit-Queue: Frank Barchard <fbarchard@chromium.org> Reviewed-by: Frank Barchard <fbarchard@chromium.org>
This commit is contained in:
parent
d359a9f922
commit
2f2c04c157
@ -13,12 +13,8 @@
|
|||||||
#ifdef HAVE_JPEG
|
#ifdef HAVE_JPEG
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#if !defined(TARGET_IPHONE_SIMULATOR)
|
|
||||||
#define TARGET_IPHONE_SIMULATOR 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(__pnacl__) && !defined(__CLR_VER) && \
|
#if !defined(__pnacl__) && !defined(__CLR_VER) && \
|
||||||
!defined(COVERAGE_ENABLED) && !TARGET_IPHONE_SIMULATOR
|
!defined(COVERAGE_ENABLED)
|
||||||
// Must be included before jpeglib.
|
// Must be included before jpeglib.
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#define HAVE_SETJMP
|
#define HAVE_SETJMP
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user