diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-12-05 09:12:01 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-12-05 09:12:01 +0000 |
| commit | 31604a65d1939a64e89b4329157cf6bbaf51bc61 (patch) | |
| tree | 71eb5431ed5bb849eea49a095fbbae0fa1680a52 /sysdeps/gnu | |
| parent | a6ff34d7b0b59a1ad501dca25558ba21f6e539bb (diff) | |
| download | glibc-31604a65d1939a64e89b4329157cf6bbaf51bc61.zip glibc-31604a65d1939a64e89b4329157cf6bbaf51bc61.tar.gz glibc-31604a65d1939a64e89b4329157cf6bbaf51bc61.tar.bz2 | |
Update.
1998-12-05 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/gnu/bits/utmp.h: Rename struct exit_status to
__exit_status.
(struct __exit_status): Define members without leading __ only for
__USE_GNU.
* sysdeps/gnu/bits/utmpx.h (struct __exit_status): Define members
without leading __ only for __USE_GNU.
Diffstat (limited to 'sysdeps/gnu')
| -rw-r--r-- | sysdeps/gnu/bits/utmp.h | 35 | ||||
| -rw-r--r-- | sysdeps/gnu/bits/utmpx.h | 5 |
2 files changed, 25 insertions, 15 deletions
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h index 9310e33..78d090a 100644 --- a/sysdeps/gnu/bits/utmp.h +++ b/sysdeps/gnu/bits/utmp.h @@ -1,5 +1,5 @@ /* The `struct utmp' type, describing entries in the utmp file. GNU version. - Copyright (C) 1993, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -42,29 +42,34 @@ struct lastlog /* The structure describing the status of a terminated process. This type is used in `struct utmp' below. */ -struct exit_status +struct __exit_status { +#ifdef __USE_GNU short int e_termination; /* Process termination status. */ short int e_exit; /* Process exit status. */ +#else + short int __e_termination; /* Process termination status. */ + short int __e_exit; /* Process exit status. */ +#endif }; /* The structure describing an entry in the user accounting database. */ struct utmp - { - short int ut_type; /* Type of login. */ - pid_t ut_pid; /* Process ID of login process. */ - char ut_line[UT_LINESIZE]; /* Devicename. */ - char ut_id[4]; /* Inittab ID. */ - char ut_user[UT_NAMESIZE]; /* Username. */ - char ut_host[UT_HOSTSIZE]; /* Hostname for remote login. */ - struct exit_status ut_exit; /* Exit status of a process marked +{ + short int ut_type; /* Type of login. */ + pid_t ut_pid; /* Process ID of login process. */ + char ut_line[UT_LINESIZE]; /* Devicename. */ + char ut_id[4]; /* Inittab ID. */ + char ut_user[UT_NAMESIZE]; /* Username. */ + char ut_host[UT_HOSTSIZE]; /* Hostname for remote login. */ + struct __exit_status ut_exit; /* Exit status of a process marked as DEAD_PROCESS. */ - long ut_session; /* Session ID, used for windowing. */ - struct timeval ut_tv; /* Time entry was made. */ - int32_t ut_addr_v6[4]; /* Internet address of remote host. */ - char __unused[20]; /* Reserved for future use. */ - }; + long int ut_session; /* Session ID, used for windowing. */ + struct timeval ut_tv; /* Time entry was made. */ + int32_t ut_addr_v6[4]; /* Internet address of remote host. */ + char __unused[20]; /* Reserved for future use. */ +}; /* Backwards compatibility hacks. */ #define ut_name ut_user diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h index b7613a1..74befe5 100644 --- a/sysdeps/gnu/bits/utmpx.h +++ b/sysdeps/gnu/bits/utmpx.h @@ -40,8 +40,13 @@ type is used in `struct utmpx' below. */ struct __exit_status { +#ifdef __USE_GNU + short int e_termination; /* Process termination status. */ + short int e_exit; /* Process exit status. */ +#else short int __e_termination; /* Process termination status. */ short int __e_exit; /* Process exit status. */ +#endif }; |