CVS commit: src/sys

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Nov 17 02:23:33 UTC 2014

Modified Files:
        src/sys/dev: clock_subr.c
        src/sys/fs/smbfs: smbfs_subr.c

Log Message:
make this compile again.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/clock_subr.c
cvs rdiff -u -r1.18 -r1.19 src/sys/fs/smbfs/smbfs_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/clock_subr.c
diff -u src/sys/dev/clock_subr.c:1.23 src/sys/dev/clock_subr.c:1.24
--- src/sys/dev/clock_subr.c:1.23	Sun Nov 16 21:15:49 2014
+++ src/sys/dev/clock_subr.c	Sun Nov 16 21:23:33 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock_subr.c,v 1.23 2014/11/17 02:15:49 christos Exp $	*/
+/*	$NetBSD: clock_subr.c,v 1.24 2014/11/17 02:23:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,7 +50,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.23 2014/11/17 02:15:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.24 2014/11/17 02:23:33 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,7 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: clock_subr.c
 
 #include <dev/clock_subr.h>
 
-static inline int leapyear(uint64_t year);
 #define FEBRUARY	2
 
 /* for easier alignment:
@@ -118,7 +117,7 @@ clock_ymdhms_to_secs(struct clock_ymdhms
 		year -= i * 4;
 
 		for (i = dt->dt_year-year; i < dt->dt_year; i++)
-			days += days_in_year(i);
+			days += days_per_year(i);
 	}
 
 

Index: src/sys/fs/smbfs/smbfs_subr.c
diff -u src/sys/fs/smbfs/smbfs_subr.c:1.18 src/sys/fs/smbfs/smbfs_subr.c:1.19
--- src/sys/fs/smbfs/smbfs_subr.c:1.18	Sun Nov 16 21:15:49 2014
+++ src/sys/fs/smbfs/smbfs_subr.c	Sun Nov 16 21:23:33 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: smbfs_subr.c,v 1.18 2014/11/17 02:15:49 christos Exp $	*/
+/*	$NetBSD: smbfs_subr.c,v 1.19 2014/11/17 02:23:33 christos Exp $	*/
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_subr.c,v 1.18 2014/11/17 02:15:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_subr.c,v 1.19 2014/11/17 02:23:33 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: smbfs_subr.c
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/sysctl.h>
+#include <sys/clock.h>
 #include <netsmb/iconv.h>
 
 #include <netsmb/smb.h>