From 45c0f19ae192cfe679751e26d7bcc282a6113c7f Mon Sep 17 00:00:00 2001 From: Greg Bolsinga Date: Fri, 21 Aug 2020 14:22:34 -0700 Subject: [PATCH] Do not expose tgmath.h to all clients of Texture (#1900) * Do not expose tgmath.h to all clients of Texture - tgmath.h #undef the `log` macro for mathematical reasons. Code that may also use a log name (such as CocoaLumberjack) will get confused by this when they try to use `NS_SWIFT_NAME` with `log` as part of the name. - `ABS` from NSObjCRuntime.h is what is typically used for abs on `CGFloat`. - Note: removing tgmath.h from the Texture umbrella header may expose clients that implicitly depended upon it being imported. Sources may have to be updated after this to `#import ` explicitly. --- Source/Details/CoreGraphics+ASConvenience.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Details/CoreGraphics+ASConvenience.h b/Source/Details/CoreGraphics+ASConvenience.h index a0805f17..e1e96033 100644 --- a/Source/Details/CoreGraphics+ASConvenience.h +++ b/Source/Details/CoreGraphics+ASConvenience.h @@ -8,10 +8,7 @@ // #import - #import -#import - #import @@ -45,7 +42,7 @@ ASDISPLAYNODE_INLINE CGFloat ASCGFloatFromNumber(NSNumber *number) ASDISPLAYNODE_INLINE BOOL CGSizeEqualToSizeWithIn(CGSize size1, CGSize size2, CGFloat delta) { - return fabs(size1.width - size2.width) < delta && fabs(size1.height - size2.height) < delta; + return ABS(size1.width - size2.width) < delta && ABS(size1.height - size2.height) < delta; }; NS_ASSUME_NONNULL_END