diff options
| author | Jay Freeman <saurik@saurik.com> | 2008-06-17 19:27:33 +0000 |
|---|---|---|
| committer | Jay Freeman <saurik@saurik.com> | 2008-06-17 19:27:33 +0000 |
| commit | 00f9a8f26321d0e37ecab72777bd77aab249d4ab (patch) | |
| tree | e25f97eb8fbf9a986685b70ede1c15312011034e | |
| parent | afdd4811bdbe4398643f20210e3b0850d1228110 (diff) | |
Lost half of the previous utmp.h patch.
git-svn-id: http://svn.telesphoreo.org/trunk@322 514c082c-b64e-11dc-b46d-3d985efe055d
| -rw-r--r-- | tool/include.diff | 15 | ||||
| -rw-r--r-- | tool/patches/utmp.diff | 15 |
2 files changed, 20 insertions, 10 deletions
diff --git a/tool/include.diff b/tool/include.diff index 869dfbf6d..eb74e2c67 100644 --- a/tool/include.diff +++ b/tool/include.diff @@ -354,11 +354,9 @@ index c70c6fb..1effc37 100644 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 { +--- /usr/include/utmp.h 2008-05-25 06:24:18.000000000 +0000 ++++ /usr/include/utmp.h 2008-06-17 19:26:23.000000000 +0000 +@@ -92,13 +92,13 @@ time_t ll_time; char ll_line[UT_LINESIZE]; char ll_host[UT_HOSTSIZE]; @@ -367,6 +365,13 @@ index a361c50..24d6f50 100644 struct utmp { char ut_line[UT_LINESIZE]; + char ut_name[UT_NAMESIZE]; + char ut_host[UT_HOSTSIZE]; + long ut_time; +-} __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); + + #endif /* !_UTMP_H_ */ 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/utmp.diff b/tool/patches/utmp.diff index 80268d717..99303cfc4 100644 --- a/tool/patches/utmp.diff +++ b/tool/patches/utmp.diff @@ -1,8 +1,6 @@ -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 { +--- /usr/include/utmp.h 2008-05-25 06:24:18.000000000 +0000 ++++ /usr/include/utmp.h 2008-06-17 19:26:23.000000000 +0000 +@@ -92,13 +92,13 @@ time_t ll_time; char ll_line[UT_LINESIZE]; char ll_host[UT_HOSTSIZE]; @@ -11,3 +9,10 @@ index a361c50..24d6f50 100644 struct utmp { char ut_line[UT_LINESIZE]; + char ut_name[UT_NAMESIZE]; + char ut_host[UT_HOSTSIZE]; + long ut_time; +-} __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); + + #endif /* !_UTMP_H_ */ |