summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tool/include.diff20
-rw-r--r--tool/patches/AvailabilityInternal.diff20
2 files changed, 16 insertions, 24 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
diff --git a/tool/patches/AvailabilityInternal.diff b/tool/patches/AvailabilityInternal.diff
index 815674811..53a431ab0 100644
--- a/tool/patches/AvailabilityInternal.diff
+++ b/tool/patches/AvailabilityInternal.diff
@@ -1,6 +1,9 @@
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__
@@ -10,7 +13,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
@@ -19,23 +22,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