summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2013-07-04 00:25:37 +0000
committerguenther <guenther@openbsd.org>2013-07-04 00:25:37 +0000
commitb070f96b4d299371fa6b496e383d8906b0849b4d (patch)
tree30bb515f256489242724978532a42bba5a5208ba
parentRe-commit: use time_t for storing time_t values. This is an ABI (diff)
downloadwireguard-openbsd-b070f96b4d299371fa6b496e383d8906b0849b4d.tar.xz
wireguard-openbsd-b070f96b4d299371fa6b496e383d8906b0849b4d.zip
Merge rev 1.16 of cl.c: time_t is not long
-rw-r--r--sys/arch/mvme68k/dev/wl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/mvme68k/dev/wl.c b/sys/arch/mvme68k/dev/wl.c
index 0258ed06c9d..48cdffa201d 100644
--- a/sys/arch/mvme68k/dev/wl.c
+++ b/sys/arch/mvme68k/dev/wl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wl.c,v 1.24 2012/11/04 13:33:32 miod Exp $ */
+/* $OpenBSD: wl.c,v 1.25 2013/07/04 00:25:37 guenther Exp $ */
/*
* Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -173,7 +173,7 @@ int cl_intr(struct wlsoftc *sc, int);
int cl_mintr(struct wlsoftc *sc);
int cl_txintr(struct wlsoftc *sc);
int cl_rxintr(struct wlsoftc *sc);
-void cl_overflow(struct wlsoftc *sc, int channel, long *ptime, u_char *msg);
+void cl_overflow(struct wlsoftc *sc, int channel, time_t *ptime, u_char *msg);
void cl_parity(struct wlsoftc *sc, int channel);
void cl_frame(struct wlsoftc *sc, int channel);
void cl_break( struct wlsoftc *sc, int channel);
@@ -1313,7 +1313,7 @@ void
cl_overflow (sc, channel, ptime, msg)
struct wlsoftc *sc;
int channel;
-long *ptime;
+time_t *ptime;
u_char *msg;
{
/*