Mercurial > hg > octave-nkf > gnulib-hg
changeset 2229:b3a94d16a532
redo it on per-header basis
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sun, 30 Jan 2000 16:45:17 +0000 |
parents | cde4d94f6ccf |
children | d7cbccae7e0b |
files | lib/readutmp.h |
diffstat | 1 files changed, 23 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/readutmp.h +++ b/lib/readutmp.h @@ -30,14 +30,6 @@ # include <sys/types.h> -/* Accessor macro for the member named ut_user or ut_name. */ -# if HAVE_STRUCT_UTMPX_UT_USER || HAVE_STRUCT_UTMP_UT_USER -# define UT_USER(Utmp) Utmp->ut_user -# endif -# if HAVE_STRUCT_UTMPX_UT_NAME || HAVE_STRUCT_UTMP_UT_NAME -# define UT_USER(Utmp) Utmp->ut_name -# endif - # ifdef HAVE_UTMPX_H # include <utmpx.h> # define UTMP_STRUCT_NAME utmpx @@ -56,6 +48,29 @@ # define UTMP_NAME_FUNCTION utmpname # endif +/* Accessor macro for the member named ut_user or ut_name. */ +# ifdef HAVE_UTMPX_H + +# if HAVE_STRUCT_UTMPX_UT_USER +# define UT_USER(Utmp) Utmp->ut_user +# endif +# if HAVE_STRUCT_UTMPX_UT_NAME +# undef UT_USER +# define UT_USER(Utmp) Utmp->ut_name +# endif + +# else + +# if HAVE_STRUCT_UTMP_UT_USER +# define UT_USER(Utmp) Utmp->ut_user +# endif +# if HAVE_STRUCT_UTMP_UT_NAME +# undef UT_USER +# define UT_USER(Utmp) Utmp->ut_name +# endif + +# endif + typedef struct UTMP_STRUCT_NAME STRUCT_UTMP; # include <time.h>