summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1997-07-13 03:55:38 +0000
committerJim Meyering <jim@meyering.net>1997-07-13 03:55:38 +0000
commitb64068263b8dca68635a6472b8974bb6cb28fbc2 (patch)
tree5206063422dc5cd55122a4430d9cc60216b14dea
parent7402d9119ce48aa1d289099e3e567c19b2281dfa (diff)
downloadgnulib-SH-UTILS-1_16c.tar.gz
(PARAMS): Update prototype.SH-UTILS-1_16c
(utmp_contents): Remove dcl.
-rw-r--r--lib/readutmp.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/readutmp.h b/lib/readutmp.h
index 28afb780c8..f96b9dc491 100644
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -25,14 +25,16 @@
# ifdef HAVE_UTMPX_H
# include <utmpx.h>
-# define STRUCT_UTMP struct utmpx
+# define UTMP_STRUCT_NAME utmpx
# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec)
# else
# include <utmp.h>
-# define STRUCT_UTMP struct utmp
+# define UTMP_STRUCT_NAME utmp
# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_time)
# endif
+typedef struct UTMP_STRUCT_NAME STRUCT_UTMP;
+
# include <time.h>
# ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
@@ -69,8 +71,6 @@ extern int errno;
# define WTMP_FILE "/etc/wtmp"
# endif
-extern STRUCT_UTMP * utmp_contents;
-
# undef PARAMS
# if defined (__STDC__) && __STDC__
# define PARAMS(Args) Args
@@ -78,7 +78,8 @@ extern STRUCT_UTMP * utmp_contents;
# define PARAMS(Args) ()
# endif
-extern char * extract_trimmed_name PARAMS((const STRUCT_UTMP *ut));
-extern int read_utmp PARAMS((const char *filename));
+extern char *extract_trimmed_name PARAMS ((const STRUCT_UTMP *ut));
+extern int read_utmp PARAMS ((const char *filename,
+ int *n_entries, STRUCT_UTMP **utmp_buf));
#endif /* __READUTMP_H__ */