X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.h;h=317a8f699706a2e11eb23f0808b9da8a210b8575;hb=8d7314ae9fde9984d9cebe27a96806e02f77be64;hp=5a08fdab41c028acb12ac9a0c07c1b7a2e55139f;hpb=a9dbf48d7c5cd3fc1a0f72188585c37dd715069e;p=gnulib.git diff --git a/lib/readutmp.h b/lib/readutmp.h index 5a08fdab4..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 @@ -31,6 +31,10 @@ # include # ifdef HAVE_UTMPX_H +# ifdef HAVE_UTMP_H + /* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE. */ +# include +# endif # include # define UTMP_STRUCT_NAME utmpx # define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec) @@ -65,6 +69,9 @@ # 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 @@ -75,6 +82,9 @@ # 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