| Index: runtime/platform/globals.h
 | 
| diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
 | 
| index d1c6ef636165bcca9da87356a5c1439702ab6bcb..82f5719e31a7264d63583f9c359e6a3cd43a4ae8 100644
 | 
| --- a/runtime/platform/globals.h
 | 
| +++ b/runtime/platform/globals.h
 | 
| @@ -102,6 +102,9 @@
 | 
|  // the value defined in TargetConditionals.h
 | 
|  #define TARGET_OS_MACOS 1
 | 
|  #if TARGET_OS_IPHONE
 | 
| +// Test for this #define by saying '#if TARGET_OS_IOS' rather than the usual
 | 
| +// '#if defined(TARGET_OS_IOS)'. TARGET_OS_IOS is defined to be 0 in
 | 
| +// XCode >= 7.0. See Issue #24453.
 | 
|  #define TARGET_OS_IOS 1
 | 
|  #endif
 | 
|  
 | 
| 
 |