diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
| commit | 60063627a6d540871061854a362047e6517f821c (patch) | |
| tree | 0de228630450c64e085f2e3f5141b5ba17eccab3 /miscutils/last.c | |
| parent | ec39cb770ddd5c0e085d5c4ee10be65bab5e7a44 (diff) | |
| parent | 9a595bb36ded308e6d4336aef2c1cd3ac738a398 (diff) | |
| download | busybox-w32-FRP.tar.gz busybox-w32-FRP.tar.bz2 busybox-w32-FRP.zip | |
Merge branch 'busybox' into mergeFRP
Diffstat (limited to '')
| -rw-r--r-- | miscutils/last.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/last.c b/miscutils/last.c index a144c7e47..6d8b58463 100644 --- a/miscutils/last.c +++ b/miscutils/last.c | |||
| @@ -32,21 +32,21 @@ | |||
| 32 | 32 | ||
| 33 | #if defined UT_LINESIZE \ | 33 | #if defined UT_LINESIZE \ |
| 34 | && ((UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256)) | 34 | && ((UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256)) |
| 35 | #error struct utmp member char[] size(s) have changed! | 35 | #error struct utmpx member char[] size(s) have changed! |
| 36 | #elif defined __UT_LINESIZE \ | 36 | #elif defined __UT_LINESIZE \ |
| 37 | && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 64) || (__UT_HOSTSIZE != 256)) | 37 | && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 64) || (__UT_HOSTSIZE != 256)) |
| 38 | #error struct utmp member char[] size(s) have changed! | 38 | #error struct utmpx member char[] size(s) have changed! |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | #if EMPTY != 0 || RUN_LVL != 1 || BOOT_TIME != 2 || NEW_TIME != 3 || \ | 41 | #if EMPTY != 0 || RUN_LVL != 1 || BOOT_TIME != 2 || NEW_TIME != 3 || \ |
| 42 | OLD_TIME != 4 | 42 | OLD_TIME != 4 |
| 43 | #error Values for the ut_type field of struct utmp changed | 43 | #error Values for the ut_type field of struct utmpx changed |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 46 | int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 47 | int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | 47 | int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) |
| 48 | { | 48 | { |
| 49 | struct utmp ut; | 49 | struct utmpx ut; |
| 50 | int n, file = STDIN_FILENO; | 50 | int n, file = STDIN_FILENO; |
| 51 | time_t t_tmp; | 51 | time_t t_tmp; |
| 52 | off_t pos; | 52 | off_t pos; |
