diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2003-08-16 03:51:49 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2003-08-16 03:51:49 +0000 |
| commit | 7ed24447f83e29609418cb284091e603573cc272 (patch) | |
| tree | 451bd3e0f1357fe4665d0dfec834ff2e2d5f7cc1 /lib/readutmp.h | |
| parent | 1fea47043952c3c97e5c66a080a3f1aa7fadb68c (diff) | |
| download | gnulib-7ed24447f83e29609418cb284091e603573cc272.tar.gz | |
Merge from coreutils.
Diffstat (limited to 'lib/readutmp.h')
| -rw-r--r-- | lib/readutmp.h | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/lib/readutmp.h b/lib/readutmp.h index d122987e53..be59fe9949 100644 --- a/lib/readutmp.h +++ b/lib/readutmp.h @@ -24,6 +24,13 @@ # include <sys/types.h> +/* AIX 4.3.3 has both utmp.h and utmpx.h, but only struct utmp + has the ut_exit member. */ +# if (HAVE_UTMPX_H && HAVE_UTMP_H && HAVE_STRUCT_UTMP_UT_EXIT \ + && ! HAVE_STRUCT_UTMPX_UT_EXIT) +# undef HAVE_UTMPX_H +# endif + # ifdef HAVE_UTMPX_H # ifdef HAVE_UTMP_H /* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE. */ @@ -38,6 +45,27 @@ # ifdef HAVE_UTMPXNAME # define UTMP_NAME_FUNCTION utmpxname # endif + +# if HAVE_STRUCT_UTMPX_UT_EXIT_E_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.e_termination) +# else +# if HAVE_STRUCT_UTMPX_UT_EXIT_UT_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.ut_termination) +# else +# define UT_EXIT_E_TERMINATION(U) 0 +# endif +# endif + +# if HAVE_STRUCT_UTMPX_UT_EXIT_E_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.e_exit) +# else +# if HAVE_STRUCT_UTMPX_UT_EXIT_UT_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.ut_exit) +# else +# define UT_EXIT_E_EXIT(U) 0 +# endif +# endif + # else # include <utmp.h> # if !HAVE_DECL_GETUTENT @@ -51,6 +79,27 @@ # ifdef HAVE_UTMPNAME # define UTMP_NAME_FUNCTION utmpname # endif + +# if HAVE_STRUCT_UTMP_UT_EXIT_E_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.e_termination) +# else +# if HAVE_STRUCT_UTMP_UT_EXIT_UT_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.ut_termination) +# else +# define UT_EXIT_E_TERMINATION(U) 0 +# endif +# endif + +# if HAVE_STRUCT_UTMP_UT_EXIT_E_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.e_exit) +# else +# if HAVE_STRUCT_UTMP_UT_EXIT_UT_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.ut_exit) +# else +# define UT_EXIT_E_EXIT(U) 0 +# endif +# endif + # endif /* Accessor macro for the member named ut_user or ut_name. */ |