redo it on per-header basis

diff --git a/lib/readutmp.h b/lib/readutmp.h
index d7ad90c2686df1447d25f37ad908d7d394b08c2a..a555e58eeaf421ccb8e2db5d3b6603f80dec1764 100644 (file)
--- 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>