summary refs log tree commit diff
path: root/login
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-04-05 07:21:12 +0000
committerUlrich Drepper <drepper@redhat.com>2001-04-05 07:21:12 +0000
commitf128331c351b7a369aa39ac61241f1aae6f71841 (patch)
treeb89e465016c08d9abbdb07be9f77d4f11dcc2821 /login
parentb53df4c940bdfb4a23e065c7b3a919b4ed054f03 (diff)
downloadglibc-f128331c351b7a369aa39ac61241f1aae6f71841.tar.gz
glibc-f128331c351b7a369aa39ac61241f1aae6f71841.tar.xz
glibc-f128331c351b7a369aa39ac61241f1aae6f71841.zip
Update.
2001-04-05  Ulrich Drepper  <drepper@redhat.com>

	* login/tst-utmp.c: Make file usable again in tst-utmpx.c.
Diffstat (limited to 'login')
-rw-r--r--login/tst-utmp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/login/tst-utmp.c b/login/tst-utmp.c
index 56823b239e..8497067eb3 100644
--- a/login/tst-utmp.c
+++ b/login/tst-utmp.c
@@ -1,5 +1,5 @@
 /* Tests for UTMP functions.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
    Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1998.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -73,7 +73,7 @@ do_prepare (int argc, char *argv[])
 
 struct utmp entry[] =
 {
-#if _HAVE_UT_TV
+#if _HAVE_UT_TV || defined UTMPX
 #define UT(a)  ut_tv:{tv_sec:(a)}
 #else
 #define UT(a)  ut_time:(a)
@@ -165,7 +165,7 @@ simulate_login (const char *line, const char *user)
 	    entry[n].ut_pid = (entry_pid += 27);
 	  entry[n].ut_type = USER_PROCESS;
 	  strcpy (entry[n].ut_user, user);
-#if _HAVE_UT_TV - 0
+#if _HAVE_UT_TV - 0 || defined UTMPX
 	  entry[n].ut_tv.tv_sec = (entry_time += 1000);
 #else
           entry[n].ut_time = (entry_time += 1000);
@@ -199,7 +199,7 @@ simulate_logout (const char *line)
 	{
 	  entry[n].ut_type = DEAD_PROCESS;
 	  entry[n].ut_user[0] = '\0';
-#if _HAVE_UT_TV - 0
+#if _HAVE_UT_TV - 0 || defined UTMPX
           entry[n].ut_tv.tv_sec = (entry_time += 1000);
 #else
           entry[n].ut_time = (entry_time += 1000);