commit ab5ce2e34e63113c36e0f08f60866f487c55b879
author Karoy Lorentey <klorentey@apple.com> Sat Aug 04 00:45:32 2018 +0100
committer GitHub <noreply@github.com> Sat Aug 04 00:45:32 2018 +0100
tree 520ec873b8fd98d24e933f582124ca6840d0d2ac
parent 68f32fc2aa8ea47be78333b0a5c90e35fdcf2e68
parent 786f6f47c81a42934ff7dcb29ef3dfae4c09b5e9

Merge pull request #18468 from lorentey/deprecated_simulator_macro-4.2

[4.2][stdlib]Remove deprecated TARGET_IPHONE_SIMULATOR reference

stdlib/public/stubs/Availability.mm

diff --git a/stdlib/public/stubs/Availability.mm b/stdlib/public/stubs/Availability.mm
index f1e4750..65ab67c 100644
--- a/stdlib/public/stubs/Availability.mm
+++ b/stdlib/public/stubs/Availability.mm
@@ -30,7 +30,7 @@
 static NSDictionary *systemVersionDictionaryFromPlist() {
   NSString *plistPath = @"/System/Library/CoreServices/SystemVersion.plist";
 
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
   // When targeting the iOS simulator, look in a special location so we do
   // not pick up the host OS version.
   const char *simulatorRoot = getenv("IPHONE_SIMULATOR_ROOT");