diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2012-10-13 19:40:42 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2012-10-13 19:40:42 +0000 |
| commit | 256f3a3dba73b803a29ae012ff6e136fd72e7294 (patch) | |
| tree | e533d59b6703e89ff55f633cba2f2285d9b30e49 /net/openbgpd/files/patch-bgpd_timer.c | |
| parent | Update to Wine 1.5.15. This includes the following changes: (diff) | |
Update to 5.2.20121014.
Feature safe: yes
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_timer.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_timer.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/net/openbgpd/files/patch-bgpd_timer.c b/net/openbgpd/files/patch-bgpd_timer.c index 1bace94e1998..1238897b94fa 100644 --- a/net/openbgpd/files/patch-bgpd_timer.c +++ b/net/openbgpd/files/patch-bgpd_timer.c @@ -2,17 +2,26 @@ Index: bgpd/timer.c =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/timer.c,v retrieving revision 1.1.1.2 -retrieving revision 1.1.1.3 -diff -u -p -r1.1.1.2 -r1.1.1.3 +retrieving revision 1.1.1.4 +diff -u -p -r1.1.1.2 -r1.1.1.4 --- bgpd/timer.c 9 Jul 2009 16:49:54 -0000 1.1.1.2 -+++ bgpd/timer.c 12 Jun 2011 10:44:25 -0000 1.1.1.3 ++++ bgpd/timer.c 13 Oct 2012 18:22:50 -0000 1.1.1.4 @@ -1,4 +1,4 @@ -/* $OpenBSD: timer.c,v 1.13 2009/01/21 20:32:53 henning Exp $ */ +/* $OpenBSD: timer.c,v 1.14 2010/10/24 17:20:08 deraadt Exp $ */ /* * Copyright (c) 2003-2007 Henning Brauer <henning@openbsd.org> -@@ -43,7 +43,7 @@ timer_get(struct peer *p, enum Timer tim +@@ -23,8 +23,6 @@ + #include "bgpd.h" + #include "session.h" + +-time_t getmonotime(void); +- + time_t + getmonotime(void) + { +@@ -43,7 +41,7 @@ timer_get(struct peer *p, enum Timer tim TAILQ_FOREACH(pt, &p->timers, entry) if (pt->type == timer) |