From 7652afc74f51fa3c4f4b56898c2e14fce157af5f Mon Sep 17 00:00:00 2001
From: "gtm.daemon" <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>
Date: Sat, 26 Apr 2014 00:00:07 +0000
Subject: Comment on the difference between GTMCFAutorelease and iOS 7's
 CFAutorelease.  Update GTM's definition of the standard OS X/iOS version
 macros. Remove GTMDefines dependency from GTMNSString+URLArguments and
 GTMURITemplate.

DELTA=38 (27 added, 4 deleted, 7 changed)
DELTA_BY_EXTENSION=h=23,m=11
---
 GTMDefines.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'GTMDefines.h')

diff --git a/GTMDefines.h b/GTMDefines.h
index 14ffa7e..c24053e 100644
--- a/GTMDefines.h
+++ b/GTMDefines.h
@@ -39,6 +39,12 @@
 #ifndef MAC_OS_X_VERSION_10_7
   #define MAC_OS_X_VERSION_10_7 1070
 #endif
+#ifndef MAC_OS_X_VERSION_10_8
+  #define MAC_OS_X_VERSION_10_8 1080
+#endif
+#ifndef MAC_OS_X_VERSION_10_9
+  #define MAC_OS_X_VERSION_10_9 1090
+#endif
 
 // Not all __IPHONE_X macros defined in past SDKs
 #ifndef __IPHONE_3_0
@@ -59,6 +65,21 @@
 #ifndef __IPHONE_5_0
   #define __IPHONE_5_0 50000
 #endif
+#ifndef __IPHONE_5_1
+  #define __IPHONE_5_1 50100
+#endif
+#ifndef __IPHONE_6_0
+  #define __IPHONE_6_0 60000
+#endif
+#ifndef __IPHONE_6_1
+  #define __IPHONE_6_1 60100
+#endif
+#ifndef __IPHONE_7_0
+  #define __IPHONE_7_0 70000
+#endif
+#ifndef __IPHONE_7_1
+  #define __IPHONE_7_1 70100
+#endif
 
 // ----------------------------------------------------------------------------
 // CPP symbols that can be overridden in a prefix to control how the toolbox
@@ -379,6 +400,8 @@
 #endif
 
 #ifndef GTMCFAutorelease
+  // GTMCFAutorelease returns an id.  In contrast, Apple's CFAutorelease returns
+  // a CFTypeRef.
   #if __has_feature(objc_arc)
     #define GTMCFAutorelease(x) CFBridgingRelease(x)
   #else
-- 
cgit v1.2.3