[PATCH] login-utils: Fix unused variables in login.c if _HAVE_UT_TV isn't defined

[PATCH] login-utils: Fix unused variables in login.c if _HAVE_UT_TV isn't defined

[Will Johansson]

Wrap around the variable declaration for `tv' with ifdef so the compilers
don't warn about unused variables if we're compiling without UT_TV. This
happens with the musl libc, since it doesn't define _HAVE_UT_TV, even
though it _does_ have the ut_tv field in the utmp struct.

Signed-off-by: Will Johansson <will.johansson@gmail.com>
---
 login-utils/login.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/login-utils/login.c b/login-utils/login.c
index 540554e..f07358f 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -429,7 +429,9 @@ static void init_tty(struct login_context *cxt)
 static void log_btmp(struct login_context *cxt)
 {
 	struct utmp ut;
+#if defined(_HAVE_UT_TV)        /* in <utmpbits.h> included by <utmp.h> */
 	struct timeval tv;
+#endif
 
 	memset(&ut, 0, sizeof(ut));
 
-- 
1.8.3.1

Re: [PATCH] login-utils: Fix unused variables in login.c if _HAVE_UT_TV isn't defined

[Karel Zak]

On Mon, Dec 15, 2014 at 03:51:29AM -0800, Will Johansson wrote:
>  login-utils/login.c | 2 ++
>  1 file changed, 2 insertions(+)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com