Merged to latest Telesphoreo headers.

git-svn-id: http://svn.telesphoreo.org/trunk@355 514c082c-b64e-11dc-b46d-3d985efe055d

4 files changed, 120 insertions, 2 deletions

diff --git a/tool/include.diff b/tool/include.diff
index 0cf93a591..dc0631e15 100644
--- a/tool/include.diff
+++ b/tool/include.diff
@@ -23,9 +23,43 @@ index 1c3e1cf..cb81edb 100644
  #define __IPHONE_NA      99999  /* not available */
  
 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
@@ -352,6 +386,31 @@ index 0be1f62..c9ec079 100644
  #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
  
  #endif /* __APPLE_API_OBSOLETE */
+diff --git a/mach/arm/_structs.h b/mach/arm/_structs.h
+index e130afa..1f98c98 100644
+--- a/mach/arm/_structs.h
++++ b/mach/arm/_structs.h
+@@ -25,7 +25,7 @@ _STRUCT_ARM_EXCEPTION_STATE
+ };
+ #endif /* __DARWIN_UNIX03 */
+
+-#if __DARWIN_UNIX03
++#if __DARWIN_UNIX03 || 1
+ #define _STRUCT_ARM_THREAD_STATE       struct __darwin_arm_thread_state
+ _STRUCT_ARM_THREAD_STATE
+ {
+diff --git a/mach/arm/thread_status.h b/mach/arm/thread_status.h
+index 69f9f4f..cc66a92 100755
+--- a/mach/arm/thread_status.h
++++ b/mach/arm/thread_status.h
+@@ -2,6 +2,7 @@
+ #define _MACH_ARM_THREAD_STATUS_H_
+
+ #define ARM_THREAD_STATE        1
++#define THREAD_STATE_NONE       2
+
+ typedef struct arm_thread_state {
+        unsigned int r0;
 diff --git /usr/include/util.h /usr/include/util.h
 index c70c6fb..1effc37 100644
 --- /usr/include/util.h
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
diff --git a/tool/patches/_structs.diff b/tool/patches/_structs.diff
new file mode 100644
index 000000000..47736b7e8
--- /dev/null
+++ b/tool/patches/_structs.diff
@@ -0,0 +1,13 @@
+diff --git a/mach/arm/_structs.h b/mach/arm/_structs.h
+index e130afa..1f98c98 100644
+--- a/mach/arm/_structs.h
++++ b/mach/arm/_structs.h
+@@ -25,7 +25,7 @@ _STRUCT_ARM_EXCEPTION_STATE
+ };
+ #endif /* __DARWIN_UNIX03 */
+
+-#if __DARWIN_UNIX03
++#if __DARWIN_UNIX03 || 1
+ #define _STRUCT_ARM_THREAD_STATE       struct __darwin_arm_thread_state
+ _STRUCT_ARM_THREAD_STATE
+ {
diff --git a/tool/patches/thread_status.diff b/tool/patches/thread_status.diff
new file mode 100644
index 000000000..01c24ff69
--- /dev/null
+++ b/tool/patches/thread_status.diff
@@ -0,0 +1,12 @@
+diff --git a/mach/arm/thread_status.h b/mach/arm/thread_status.h
+index 69f9f4f..cc66a92 100755
+--- a/mach/arm/thread_status.h
++++ b/mach/arm/thread_status.h
+@@ -2,6 +2,7 @@
+ #define _MACH_ARM_THREAD_STATUS_H_
+
+ #define ARM_THREAD_STATE        1
++#define THREAD_STATE_NONE       2
+
+ typedef struct arm_thread_state {
+        unsigned int r0;