diff options
Diffstat (limited to 'login/tst-utmp.c')
| -rw-r--r-- | login/tst-utmp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/login/tst-utmp.c b/login/tst-utmp.c index 2f2da908ed..2fb20b64db 100644 --- a/login/tst-utmp.c +++ b/login/tst-utmp.c @@ -1,5 +1,5 @@ /* Tests for UTMP functions. - Copyright (C) 1998-2015 Free Software Foundation, Inc. + Copyright (C) 1998-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1998. @@ -39,7 +39,7 @@ #endif -#if _HAVE_UT_TYPE || defined UTMPX +#if defined UTMPX || _HAVE_UT_TYPE /* Prototype for our test function. */ static int do_test (int argc, char *argv[]); @@ -65,17 +65,17 @@ do_prepare (int argc, char *argv[]) name = malloc (name_len + sizeof ("/utmpXXXXXX")); mempcpy (mempcpy (name, test_dir, name_len), "/utmpXXXXXX", sizeof ("/utmpXXXXXX")); - add_temp_file (name); /* Open our test file. */ fd = mkstemp (name); if (fd == -1) error (EXIT_FAILURE, errno, "cannot open test file `%s'", name); + add_temp_file (name); } struct utmp entry[] = { -#if _HAVE_UT_TV || defined UTMPX +#if defined UTMPX || _HAVE_UT_TV #define UT(a) .ut_tv = { .tv_sec = (a)} #else #define UT(a) .ut_time = (a) @@ -167,7 +167,7 @@ simulate_login (const char *line, const char *user) entry[n].ut_pid = (entry_pid += 27); entry[n].ut_type = USER_PROCESS; strncpy (entry[n].ut_user, user, sizeof (entry[n].ut_user)); -#if _HAVE_UT_TV - 0 || defined UTMPX +#if defined UTMPX || _HAVE_UT_TV - 0 entry[n].ut_tv.tv_sec = (entry_time += 1000); #else entry[n].ut_time = (entry_time += 1000); @@ -201,7 +201,7 @@ simulate_logout (const char *line) { entry[n].ut_type = DEAD_PROCESS; strncpy (entry[n].ut_user, "", sizeof (entry[n].ut_user)); -#if _HAVE_UT_TV - 0 || defined UTMPX +#if defined UTMPX || _HAVE_UT_TV - 0 entry[n].ut_tv.tv_sec = (entry_time += 1000); #else entry[n].ut_time = (entry_time += 1000); |