1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-06-25 03:26:32 +02:00

redo it on per-header basis

This commit is contained in:
Jim Meyering
2000-01-30 16:45:17 +00:00
parent 774786b0cd
commit 3d64706c7e
+23 -8
View File
@@ -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>