summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tool/include.diff86
-rw-r--r--tool/patches/Availability.diff13
-rw-r--r--tool/patches/AvailabilityInternal.diff24
-rw-r--r--tool/patches/OSServices.diff20
-rw-r--r--tool/patches/util.diff16
-rw-r--r--tool/patches/utmp.diff13
6 files changed, 172 insertions, 0 deletions
diff --git a/tool/include.diff b/tool/include.diff
index 688bd5938..869dfbf6d 100644
--- a/tool/include.diff
+++ b/tool/include.diff
@@ -9,6 +9,43 @@
#include <stdio.h>
#if defined(__cplusplus)
+diff --git /usr/include/Availability.h /usr/include/Availability.h
+index 1c3e1cf..cb81edb 100644
+--- /usr/include/Availability.h
++++ /usr/include/Availability.h
+@@ -98,6 +98,8 @@
+ #define __MAC_10_6 1060
+ #define __MAC_NA 9999 /* not available */
+
++#define __IPHONE_1_0 10000
++#define __IPHONE_1_2 10200
+ #define __IPHONE_2_0 20000
+ #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
+@@ -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
+
++ #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_1_2
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2 __AVAILABILITY_INTERNAL_DEPRECATED
++ #else
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2 __AVAILABILITY_INTERNAL__IPHONE_1_0
++ #endif
++ #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL_DEPRECATED
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL_DEPRECATED
++ #else
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL__IPHONE_1_0
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL__IPHONE_1_2
++ #endif
++
+ #elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
+ // compiler for Mac OS X sets __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+ #define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
--- /usr/include/AvailabilityMacros.h 2008-02-27 06:49:24.000000000 +0000
+++ /usr/include/AvailabilityMacros.h 2008-03-28 14:10:13.000000000 +0000
@@ -84,7 +84,13 @@
@@ -159,6 +196,26 @@ diff -ru /apl/inc/Foundation/NSGeometry.h /apl/32/Foundation/NSGeometry.h
#if __LP64__ || NS_BUILD_32_LIKE_64
+diff --git /usr/include/OSServices/OSServices.h /usr/include/OSServices/OSServices.h
+index f14355d..c3295cf 100644
+--- /usr/include/OSServices/OSServices.h
++++ /usr/include/OSServices/OSServices.h
+@@ -53,6 +53,7 @@
+ #include <OSServices/WSTypes.h>
+ #endif
+
++#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
+ #ifndef __WSMETHODINVOCATION__
+ #include <OSServices/WSMethodInvocation.h>
+ #endif
+@@ -60,6 +61,7 @@
+ #ifndef __WSPROTOCOLHANDLER__
+ #include <OSServices/WSProtocolHandler.h>
+ #endif
++#endif
+
+
+ #if !__LP64__
diff --git /usr/include/Security/KCExceptions.h /usr/include/Security/KCExceptions.h
index 3c62f78..e0abd87 100644
--- /usr/include/Security/KCExceptions.h
@@ -281,6 +338,35 @@ index 0be1f62..c9ec079 100644
#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
#endif /* __APPLE_API_OBSOLETE */
+diff --git /usr/include/util.h /usr/include/util.h
+index c70c6fb..1effc37 100644
+--- /usr/include/util.h
++++ /usr/include/util.h
+@@ -86,9 +86,9 @@
+
+ __BEGIN_DECLS
+ struct utmp; /* forward reference to /usr/include/utmp.h */
+-void login(struct utmp *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
++void login(struct utmp *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
+ int login_tty(int);
+-int logout(const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
++int logout(const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
+ void logwtmp(const char *, const char *, const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_2_0,__IPHONE_2_0);
+ int opendev(char *, int, int, char **);
+ int openpty(int *, int *, char *, struct termios *,
+diff --git /usr/include/utmp.h /usr/include/utmp.h
+index a361c50..24d6f50 100644
+--- /usr/include/utmp.h
++++ /usr/include/utmp.h
+@@ -92,7 +92,7 @@ struct lastlog {
+ time_t ll_time;
+ char ll_line[UT_LINESIZE];
+ char ll_host[UT_HOSTSIZE];
+-} __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
++} __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
+
+ struct utmp {
+ char ut_line[UT_LINESIZE];
diff --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
index b570daa..3309946 100644
--- /usr/include/c++/4.0.0/arm-apple-darwin8/bits/c++config.h
diff --git a/tool/patches/Availability.diff b/tool/patches/Availability.diff
new file mode 100644
index 000000000..c411fe868
--- /dev/null
+++ b/tool/patches/Availability.diff
@@ -0,0 +1,13 @@
+diff --git /usr/include/Availability.h /usr/include/Availability.h
+index 1c3e1cf..cb81edb 100644
+--- /usr/include/Availability.h
++++ /usr/include/Availability.h
+@@ -98,6 +98,8 @@
+ #define __MAC_10_6 1060
+ #define __MAC_NA 9999 /* not available */
+
++#define __IPHONE_1_0 10000
++#define __IPHONE_1_2 10200
+ #define __IPHONE_2_0 20000
+ #define __IPHONE_NA 99999 /* not available */
+
diff --git a/tool/patches/AvailabilityInternal.diff b/tool/patches/AvailabilityInternal.diff
new file mode 100644
index 000000000..12b4953d4
--- /dev/null
+++ b/tool/patches/AvailabilityInternal.diff
@@ -0,0 +1,24 @@
+diff --git /usr/include/AvailabilityInternal.h /usr/include/AvailabilityInternal.h
+index bf8ba70..10caed4 100644
+--- /usr/include/AvailabilityInternal.h
++++ /usr/include/AvailabilityInternal.h
+@@ -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
+
++ #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_1_2
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2 __AVAILABILITY_INTERNAL_DEPRECATED
++ #else
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_1_2 __AVAILABILITY_INTERNAL__IPHONE_1_0
++ #endif
++ #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_2_0
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL_DEPRECATED
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL_DEPRECATED
++ #else
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_0_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL__IPHONE_1_0
++ #define __AVAILABILITY_INTERNAL__IPHONE_1_2_DEP__IPHONE_2_0 __AVAILABILITY_INTERNAL__IPHONE_1_2
++ #endif
++
+ #elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
+ // compiler for Mac OS X sets __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+ #define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
diff --git a/tool/patches/OSServices.diff b/tool/patches/OSServices.diff
new file mode 100644
index 000000000..f0b8a986a
--- /dev/null
+++ b/tool/patches/OSServices.diff
@@ -0,0 +1,20 @@
+diff --git /usr/include/OSServices/OSServices.h /usr/include/OSServices/OSServices.h
+index f14355d..c3295cf 100644
+--- /usr/include/OSServices/OSServices.h
++++ /usr/include/OSServices/OSServices.h
+@@ -53,6 +53,7 @@
+ #include <OSServices/WSTypes.h>
+ #endif
+
++#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
+ #ifndef __WSMETHODINVOCATION__
+ #include <OSServices/WSMethodInvocation.h>
+ #endif
+@@ -60,6 +61,7 @@
+ #ifndef __WSPROTOCOLHANDLER__
+ #include <OSServices/WSProtocolHandler.h>
+ #endif
++#endif
+
+
+ #if !__LP64__
diff --git a/tool/patches/util.diff b/tool/patches/util.diff
new file mode 100644
index 000000000..3796e6ea2
--- /dev/null
+++ b/tool/patches/util.diff
@@ -0,0 +1,16 @@
+diff --git /usr/include/util.h /usr/include/util.h
+index c70c6fb..1effc37 100644
+--- /usr/include/util.h
++++ /usr/include/util.h
+@@ -86,9 +86,9 @@
+
+ __BEGIN_DECLS
+ struct utmp; /* forward reference to /usr/include/utmp.h */
+-void login(struct utmp *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
++void login(struct utmp *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
+ int login_tty(int);
+-int logout(const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
++int logout(const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
+ void logwtmp(const char *, const char *, const char *) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_2_0,__IPHONE_2_0);
+ int opendev(char *, int, int, char **);
+ int openpty(int *, int *, char *, struct termios *,
diff --git a/tool/patches/utmp.diff b/tool/patches/utmp.diff
new file mode 100644
index 000000000..80268d717
--- /dev/null
+++ b/tool/patches/utmp.diff
@@ -0,0 +1,13 @@
+diff --git /usr/include/utmp.h /usr/include/utmp.h
+index a361c50..24d6f50 100644
+--- /usr/include/utmp.h
++++ /usr/include/utmp.h
+@@ -92,7 +92,7 @@ struct lastlog {
+ time_t ll_time;
+ char ll_line[UT_LINESIZE];
+ char ll_host[UT_HOSTSIZE];
+-} __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
++} __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_1_2,__IPHONE_2_0);
+
+ struct utmp {
+ char ut_line[UT_LINESIZE];
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 10:45:45 +0000