summaryrefslogtreecommitdiff
path: root/tool/include.diff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2009-01-11 17:21:50 +0000
committerJay Freeman <saurik@saurik.com>2009-01-11 17:21:50 +0000
commit3a153194c843793bfe9c2a672e372f5012c9ca2c (patch)
tree20f4004e8209e08f4f0625042f14124cf412bc49 /tool/include.diff
parent1a6710a7052e29e73bf2903c64ef1f63abef22d1 (diff)
Simplified AvailabilityInternal from 2.0 to 2.2.
git-svn-id: http://svn.telesphoreo.org/trunk@529 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'tool/include.diff')
-rw-r--r--tool/include.diff20
1 files changed, 8 insertions, 12 deletions
diff --git a/tool/include.diff b/tool/include.diff
index 208fb09e7..b8cd9cf5b 100644
--- a/tool/include.diff
+++ b/tool/include.diff
@@ -25,6 +25,9 @@ index 1c3e1cf..cb81edb 100644
diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal.h
--- /usr/include/AvailabilityInternal.h
+++ /usr/include/AvailabilityInternal.h
+@@ -1,1 +1,1 @@
+-/*
++/*
@@ -21,7 +21,7 @@
#ifndef __IPHONE_OS_VERSION_MIN_REQUIRED
#ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
@@ -34,7 +37,7 @@ diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal
#endif
#endif
-@@ -31,11 +31,6 @@
+@@ -31,11 +31,13 @@
#ifndef __IPHONE_OS_VERSION_MAX_ALLOWED
#define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_2_0
#endif
@@ -43,23 +46,16 @@ diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal
- #undef __IPHONE_OS_VERSION_MIN_REQUIRED
- #define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_2_0
- #endif
-
- // set up internal macros
- #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_2_0
-@@ -45,6 +40,13 @@
- #else
- #define __AVAILABILITY_INTERNAL__IPHONE_2_0
- #endif
-+ #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_1_2
++ #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_1_2
+ #define __AVAILABILITY_INTERNAL__IPHONE_1_2 __AVAILABILITY_INTERNAL_UNAVAILABLE
+ #elif __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_1_2
+ #define __AVAILABILITY_INTERNAL__IPHONE_1_2 __AVAILABILITY_INTERNAL_WEAK_IMPORT
+ #else
+ #define __AVAILABILITY_INTERNAL__IPHONE_1_2
+ #endif
- #define __AVAILABILITY_INTERNAL__IPHONE_NA __AVAILABILITY_INTERNAL_UNAVAILABLE
- #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_NA __AVAILABILITY_INTERNAL__IPHONE_2_0
- #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL_DEPRECATED
+
+ // set up internal macros
+ #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_2_0
@@ -50,6 +50,19 @@
#define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL_DEPRECATED
#define __AVAILABILITY_INTERNAL__IPHONE_NA_DEP__IPHONE_NA __AVAILABILITY_INTERNAL_UNAVAILABLE