From 84b2bdcb3a6ccb96f77b5e45c6d3f3dc1090ec79 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 1 Feb 2000 16:23:30 +0000 Subject: (UT_USER): Add parens. From Andreas Schwab. --- lib/readutmp.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/readutmp.h') diff --git a/lib/readutmp.h b/lib/readutmp.h index a555e58ee..3d4ef253d 100644 --- a/lib/readutmp.h +++ b/lib/readutmp.h @@ -37,7 +37,9 @@ # define SET_UTMP_ENT setutxent # define GET_UTMP_ENT getutxent # define END_UTMP_ENT endutxent -# define UTMP_NAME_FUNCTION utmpxname +# ifdef HAVE_UTMPXNAME +# define UTMP_NAME_FUNCTION utmpxname +# endif # else # include # define UTMP_STRUCT_NAME utmp @@ -45,18 +47,20 @@ # define SET_UTMP_ENT setutent # define GET_UTMP_ENT getutent # define END_UTMP_ENT endutent -# define UTMP_NAME_FUNCTION utmpname +# ifdef HAVE_UTMPNAME +# define UTMP_NAME_FUNCTION utmpname +# endif # 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 +# define UT_USER(Utmp) ((Utmp)->ut_user) # endif # if HAVE_STRUCT_UTMPX_UT_NAME # undef UT_USER -# define UT_USER(Utmp) Utmp->ut_name +# define UT_USER(Utmp) ((Utmp)->ut_name) # endif # else -- cgit v1.2.3-54-g00ecf