diff options
| author | Jay Freeman <saurik@saurik.com> | 2008-07-11 17:20:06 +0000 |
|---|---|---|
| committer | Jay Freeman <saurik@saurik.com> | 2008-07-11 17:20:06 +0000 |
| commit | 14ac7b13f5c856baad539491c6ae4e97619dd56a (patch) | |
| tree | 8f7e1eb897de8e5b42b39de8f41763c153991de8 /tool/patches/AvailabilityInternal.diff | |
| parent | af30c7d1c5f8d25823d475dc70c90235597783c2 (diff) | |
Merged to latest Telesphoreo headers.
git-svn-id: http://svn.telesphoreo.org/trunk@355 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'tool/patches/AvailabilityInternal.diff')
| -rw-r--r-- | tool/patches/AvailabilityInternal.diff | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/tool/patches/AvailabilityInternal.diff b/tool/patches/AvailabilityInternal.diff index 12b4953d4..815674811 100644 --- a/tool/patches/AvailabilityInternal.diff +++ b/tool/patches/AvailabilityInternal.diff @@ -1,7 +1,41 @@ diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal.h -index bf8ba70..10caed4 100644 --- /usr/include/AvailabilityInternal.h +++ /usr/include/AvailabilityInternal.h +@@ -21,7 +21,7 @@ + #ifndef __IPHONE_OS_VERSION_MIN_REQUIRED + #ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ + // compiler sets __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ when -miphoneos-version-min is used +- #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_VERSION_MIN_REQUIRED__ ++ #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ + #endif + #endif + +@@ -31,11 +31,6 @@ + #ifndef __IPHONE_OS_VERSION_MAX_ALLOWED + #define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_2_0 + #endif +- // make sure a valid min is set +- #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_2_0 +- #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 ++ #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 @@ -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 |