Changeset 321

Show
Ignore:
Timestamp:
06/17/08 19:25:07 (3 months ago)
Author:
saurik
Message:

Merging in all the latest header patches.

Location:
trunk/tool
Files:
5 added
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/tool/include.diff

    r301 r321  
    1010  
    1111 #if defined(__cplusplus) 
     12diff --git /usr/include/Availability.h /usr/include/Availability.h 
     13index 1c3e1cf..cb81edb 100644 
     14--- /usr/include/Availability.h 
     15+++ /usr/include/Availability.h 
     16@@ -98,6 +98,8 @@ 
     17 #define __MAC_10_6      1060 
     18 #define __MAC_NA        9999   /* not available */ 
     19  
     20+#define __IPHONE_1_0     10000   
     21+#define __IPHONE_1_2     10200   
     22 #define __IPHONE_2_0     20000   
     23 #define __IPHONE_NA      99999  /* not available */ 
     24  
     25diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal.h 
     26index bf8ba70..10caed4 100644 
     27--- /usr/include/AvailabilityInternal.h 
     28+++ /usr/include/AvailabilityInternal.h 
     29@@ -50,6 +50,19 @@ 
     30     #define __AVAILABILITY_INTERNAL__IPHONE_2_0_DEP__IPHONE_2_0    __AVAILABILITY_INTERNAL_DEPRECATED 
     31     #define __AVAILABILITY_INTERNAL__IPHONE_NA_DEP__IPHONE_NA      __AVAILABILITY_INTERNAL_UNAVAILABLE 
     32      
     33+    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_1_2 
     34+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2        __AVAILABILITY_INTERNAL_DEPRECATED 
     35+    #else 
     36+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2        __AVAILABILITY_INTERNAL__IPHONE_1_0 
     37+    #endif 
     38+    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0 
     39+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL_DEPRECATED 
     40+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL_DEPRECATED 
     41+    #else 
     42+        #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL__IPHONE_1_0 
     43+        #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0        __AVAILABILITY_INTERNAL__IPHONE_1_2 
     44+    #endif 
     45+     
     46 #elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) 
     47     // compiler for Mac OS X sets __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 
     48     #define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ 
    1249--- /usr/include/AvailabilityMacros.h   2008-02-27 06:49:24.000000000 +0000 
    1350+++ /usr/include/AvailabilityMacros.h   2008-03-28 14:10:13.000000000 +0000 
    … …  
    160197 #if __LP64__ || NS_BUILD_32_LIKE_64 
    161198  
     199diff --git /usr/include/OSServices/OSServices.h /usr/include/OSServices/OSServices.h 
     200index f14355d..c3295cf 100644 
     201--- /usr/include/OSServices/OSServices.h 
     202+++ /usr/include/OSServices/OSServices.h 
     203@@ -53,6 +53,7 @@ 
     204 #include <OSServices/WSTypes.h> 
     205 #endif 
     206  
     207+#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) 
     208 #ifndef __WSMETHODINVOCATION__ 
     209 #include <OSServices/WSMethodInvocation.h> 
     210 #endif 
     211@@ -60,6 +61,7 @@ 
     212 #ifndef __WSPROTOCOLHANDLER__ 
     213 #include <OSServices/WSProtocolHandler.h> 
     214 #endif 
     215+#endif 
     216  
     217  
     218 #if !__LP64__ 
    162219diff --git /usr/include/Security/KCExceptions.h /usr/include/Security/KCExceptions.h 
    163220index 3c62f78..e0abd87 100644 
    … …  
    282339  
    283340 #endif /* __APPLE_API_OBSOLETE */ 
     341diff --git /usr/include/util.h /usr/include/util.h 
     342index c70c6fb..1effc37 100644 
     343--- /usr/include/util.h 
     344+++ /usr/include/util.h 
     345@@ -86,9 +86,9 @@ 
     346  
     347 __BEGIN_DECLS 
     348 struct utmp; /* forward reference to /usr/include/utmp.h */ 
     349-void   login(struct utmp *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA); 
     350+void   login(struct utmp *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0); 
     351 int    login_tty(int); 
     352-int    logout(const char *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA); 
     353+int    logout(const char *)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0); 
     354 void   logwtmp(const char *, const char *, const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_2_0,__IPHONE_2_0); 
     355 int    opendev(char *, int, int, char **); 
     356 int    openpty(int *, int *, char *, struct termios *, 
     357diff --git /usr/include/utmp.h /usr/include/utmp.h 
     358index a361c50..24d6f50 100644 
     359--- /usr/include/utmp.h 
     360+++ /usr/include/utmp.h 
     361@@ -92,7 +92,7 @@ struct lastlog { 
     362        time_t  ll_time; 
     363        char    ll_line[UT_LINESIZE]; 
     364        char    ll_host[UT_HOSTSIZE]; 
     365-}                                      __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA); 
     366+}                                      __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0); 
     367  
     368 struct utmp { 
     369        char    ut_line[UT_LINESIZE]; 
    284370diff --git /usr/include/c++/4.0.0/arm-apple-darwin8/bits/c++config.h /usr/include/c++/4.0.0/arm-apple-darwin8/bits/c++config.h 
    285371index b570daa..3309946 100644