Author: gavin
Date: Mon Jun 28 08:30:10 2010
New Revision: 209567
URL: http://svn.freebsd.org/changeset/base/209567
Log:
Make WARNS=6 safe.
Tested by: make universe
Modified:
head/usr.bin/lock/Makefile
head/usr.bin/lock/lock.c
Modified: head/usr.bin/lock/Makefile
==============================================================================
--- head/usr.bin/lock/Makefile Mon Jun 28 08:10:55 2010 (r209566)
+++ head/usr.bin/lock/Makefile Mon Jun 28 08:30:10 2010 (r209567)
@@ -7,6 +7,4 @@ BINMODE=4555
DPADD= ${LIBCRYPT}
LDADD= -lcrypt
-WARNS?= 1
-
.include <bsd.prog.mk>
Modified: head/usr.bin/lock/lock.c
==============================================================================
--- head/usr.bin/lock/lock.c Mon Jun 28 08:10:55 2010 (r209566)
+++ head/usr.bin/lock/lock.c Mon Jun 28 08:30:10 2010 (r209567)
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
#include <ctype.h>
#include <errno.h>
#include <pwd.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -257,9 +258,9 @@ hi(int signo __unused)
if (no_timeout) {
(void)putchar('\n');
} else {
- (void)printf("timeout in %ld:%ld minutes\n",
- (nexttime - timval.tv_sec) / 60,
- (nexttime - timval.tv_sec) % 60);
+ (void)printf("timeout in %jd:%jd minutes\n",
+ (intmax_t)(nexttime - timval.tv_sec) / 60,
+ (intmax_t)(nexttime - timval.tv_sec) % 60);
}
}
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
