Changeset 355 for trunk/tool

Show
Ignore:
Timestamp:
07/11/08 17:20:06 (6 months ago)
Author:
saurik
Message:

Merged to latest Telesphoreo headers.

Location:
trunk/tool
Files:
2 added
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/tool/include.diff

    r334 r355  
    2424  
    2525diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal.h 
    26 index bf8ba70..10caed4 100644 
    2726--- /usr/include/AvailabilityInternal.h 
    2827+++ /usr/include/AvailabilityInternal.h 
     28@@ -21,7 +21,7 @@ 
     29 #ifndef __IPHONE_OS_VERSION_MIN_REQUIRED 
     30        #ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ 
     31         // compiler sets __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ when -miphoneos-version-min is used 
     32-        #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_VERSION_MIN_REQUIRED__ 
     33+        #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ 
     34     #endif 
     35 #endif 
     36  
     37@@ -31,11 +31,6 @@ 
     38     #ifndef __IPHONE_OS_VERSION_MAX_ALLOWED 
     39         #define __IPHONE_OS_VERSION_MAX_ALLOWED     __IPHONE_2_0 
     40     #endif 
     41-    // make sure a valid min is set 
     42-    #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_2_0 
     43-        #undef __IPHONE_OS_VERSION_MIN_REQUIRED 
     44-        #define __IPHONE_OS_VERSION_MIN_REQUIRED    __IPHONE_2_0  
     45-    #endif 
     46      
     47     // set up internal macros 
     48      #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_2_0 
     49@@ -45,6 +40,13 @@ 
     50     #else 
     51         #define __AVAILABILITY_INTERNAL__IPHONE_2_0 
     52     #endif 
     53+     #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_1_2 
     54+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2          __AVAILABILITY_INTERNAL_UNAVAILABLE 
     55+    #elif __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_1_2 
     56+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2          __AVAILABILITY_INTERNAL_WEAK_IMPORT 
     57+    #else 
     58+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2 
     59+    #endif 
     60     #define __AVAILABILITY_INTERNAL__IPHONE_NA                     __AVAILABILITY_INTERNAL_UNAVAILABLE  
     61     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_NA     __AVAILABILITY_INTERNAL__IPHONE_2_0 
     62     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0    __AVAILABILITY_INTERNAL_DEPRECATED 
    2963@@ -50,6 +50,19 @@ 
    3064     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0    __AVAILABILITY_INTERNAL_DEPRECATED 
    … …  
    353387  
    354388 #endif /* __APPLE_API_OBSOLETE */ 
     389diff --git a/mach/arm/_structs.h b/mach/arm/_structs.h 
     390index e130afa..1f98c98 100644 
     391--- a/mach/arm/_structs.h 
     392+++ b/mach/arm/_structs.h 
     393@@ -25,7 +25,7 @@ _STRUCT_ARM_EXCEPTION_STATE 
     394 }; 
     395 #endif /* __DARWIN_UNIX03 */ 
     396 
     397-#if __DARWIN_UNIX03 
     398+#if __DARWIN_UNIX03 || 1 
     399 #define _STRUCT_ARM_THREAD_STATE       struct __darwin_arm_thread_state 
     400 _STRUCT_ARM_THREAD_STATE 
     401 { 
     402diff --git a/mach/arm/thread_status.h b/mach/arm/thread_status.h 
     403index 69f9f4f..cc66a92 100755 
     404--- a/mach/arm/thread_status.h 
     405+++ b/mach/arm/thread_status.h 
     406@@ -2,6 +2,7 @@ 
     407 #define _MACH_ARM_THREAD_STATUS_H_ 
     408 
     409 #define ARM_THREAD_STATE        1 
     410+#define THREAD_STATE_NONE       2 
     411 
     412 typedef struct arm_thread_state { 
     413        unsigned int r0; 
    355414diff --git /usr/include/util.h /usr/include/util.h 
    356415index c70c6fb..1effc37 100644 

  • trunk/tool/patches/AvailabilityInternal.diff

    r321 r355  
    11diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal.h 
    2 index bf8ba70..10caed4 100644 
    32--- /usr/include/AvailabilityInternal.h 
    43+++ /usr/include/AvailabilityInternal.h 
     4@@ -21,7 +21,7 @@ 
     5 #ifndef __IPHONE_OS_VERSION_MIN_REQUIRED 
     6        #ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ 
     7         // compiler sets __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ when -miphoneos-version-min is used 
     8-        #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_VERSION_MIN_REQUIRED__ 
     9+        #define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ 
     10     #endif 
     11 #endif 
     12  
     13@@ -31,11 +31,6 @@ 
     14     #ifndef __IPHONE_OS_VERSION_MAX_ALLOWED 
     15         #define __IPHONE_OS_VERSION_MAX_ALLOWED     __IPHONE_2_0 
     16     #endif 
     17-    // make sure a valid min is set 
     18-    #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_2_0 
     19-        #undef __IPHONE_OS_VERSION_MIN_REQUIRED 
     20-        #define __IPHONE_OS_VERSION_MIN_REQUIRED    __IPHONE_2_0  
     21-    #endif 
     22      
     23     // set up internal macros 
     24      #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_2_0 
     25@@ -45,6 +40,13 @@ 
     26     #else 
     27         #define __AVAILABILITY_INTERNAL__IPHONE_2_0 
     28     #endif 
     29+     #if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_1_2 
     30+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2          __AVAILABILITY_INTERNAL_UNAVAILABLE 
     31+    #elif __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_1_2 
     32+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2          __AVAILABILITY_INTERNAL_WEAK_IMPORT 
     33+    #else 
     34+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2 
     35+    #endif 
     36     #define __AVAILABILITY_INTERNAL__IPHONE_NA                     __AVAILABILITY_INTERNAL_UNAVAILABLE  
     37     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_NA     __AVAILABILITY_INTERNAL__IPHONE_2_0 
     38     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0    __AVAILABILITY_INTERNAL_DEPRECATED 
    539@@ -50,6 +50,19 @@ 
    640     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0    __AVAILABILITY_INTERNAL_DEPRECATED