X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.h;h=317a8f699706a2e11eb23f0808b9da8a210b8575;hb=60183d858937837c14bd8a56efc4dde0a36335d6;hp=d7ad90c2686df1447d25f37ad908d7d394b08c2a;hpb=82ba66a9d9081daafb1f2f0ac449911408797d13;p=gnulib.git

diff --git a/lib/readutmp.h b/lib/readutmp.h
index d7ad90c26..317a8f699 100644
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -1,5 +1,5 @@
 /* Declarations for GNU's read utmp module.
-   Copyright (C) 1992-2000 Free Software Foundation, Inc.
+   Copyright (C) 1992-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,30 +30,62 @@
 
 # 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
+#  ifdef HAVE_UTMP_H
+    /* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE.  */
+#   include <utmp.h>
+#  endif
 #  include <utmpx.h>
 #  define UTMP_STRUCT_NAME utmpx
 #  define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec)
 #  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 <utmp.h>
+#  if !HAVE_DECL_GETUTENT
+    struct utmp *getutent();
+#  endif
 #  define UTMP_STRUCT_NAME utmp
 #  define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_time)
 #  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)
+#  endif
+#  if HAVE_STRUCT_UTMPX_UT_NAME
+#   undef UT_USER
+#   define UT_USER(Utmp) ((Utmp)->ut_name)
+#  endif
+#  if defined HAVE_STRUCT_UTMPX_UT_TYPE
+#   define UT_TYPE(Utmp) ((Utmp)->ut_type)
+#  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
+#  if defined HAVE_STRUCT_UTMP_UT_TYPE
+#   define UT_TYPE(Utmp) ((Utmp)->ut_type)
+#  endif
+
 # endif
 
 typedef struct UTMP_STRUCT_NAME STRUCT_UTMP;