diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2009-06-30 07:35:13 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2009-06-30 07:35:13 +0000 |
| commit | 7f31ff4f937cb0e17224ee7d8e11dd7d2a690462 (patch) | |
| tree | 669ea07e99a7f19513f560292a84a25a34c55626 /net/openbgpd/files/patch-bgpctl_bgpctl.c | |
| parent | 31bf30a12605ab0dd297f15810b15ddb48b9b4f7 (diff) | |
Notes
Diffstat (limited to 'net/openbgpd/files/patch-bgpctl_bgpctl.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpctl_bgpctl.c | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/net/openbgpd/files/patch-bgpctl_bgpctl.c b/net/openbgpd/files/patch-bgpctl_bgpctl.c index 5cdfa29bea4c..4d48e132522b 100644 --- a/net/openbgpd/files/patch-bgpctl_bgpctl.c +++ b/net/openbgpd/files/patch-bgpctl_bgpctl.c @@ -1,45 +1,55 @@ ---- bgpctl/bgpctl.c.orig 2009-01-16 23:03:29.000000000 +0900 -+++ bgpctl/bgpctl.c 2009-06-24 01:26:24.000000000 +0900 -@@ -20,7 +20,6 @@ +Index: bgpctl/bgpctl.c +=================================================================== +RCS file: /home/cvs/private/hrs/openbgpd/bgpctl/bgpctl.c,v +retrieving revision 1.1.1.1 +retrieving revision 1.2 +diff -u -p -r1.1.1.1 -r1.2 +--- bgpctl/bgpctl.c 30 Jun 2009 05:46:15 -0000 1.1.1.1 ++++ bgpctl/bgpctl.c 30 Jun 2009 06:40:06 -0000 1.2 +@@ -16,11 +16,19 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + ++#if defined(__FreeBSD__) /* compat */ ++#include "openbsd-compat.h" ++#endif /* defined(__FreeBSD__) */ ++ + #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> #include <net/if.h> --#include <net/if_media.h> ++#if defined(__FreeBSD__) /* net/if_media.h */ ++#include "if_media.h" ++#else + #include <net/if_media.h> ++#endif /* defined(__FreeBSD__) */ #include <net/if_types.h> #include <err.h> -@@ -29,14 +28,20 @@ +@@ -29,7 +37,11 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> --#include <util.h> ++#if defined(__FreeBSD__) /* util.h */ ++#include "util.h" ++#else + #include <util.h> ++#endif /* defined(__FreeBSD__) */ #include "bgpd.h" #include "session.h" - #include "rde.h" - #include "log.h" +@@ -38,6 +50,10 @@ #include "parser.h" -+#include "util.h" #include "irrfilter.h" -+#include "if_media.h" -+#include "compat-openbsd.h" -+ + +#if defined(__FreeBSD__) /* FreeBSD has no LINK_STATE_IS_UP macro. */ +#define LINK_STATE_IS_UP(_s) ((_s) >= LINK_STATE_UP) +#endif /* defined(__FreeBSD__) */ - ++ enum neighbor_views { NV_DEFAULT, -@@ -84,7 +89,7 @@ - - struct imsgbuf *ibuf; - --__dead void -+ void - usage(void) - { - extern char *__progname; -@@ -677,7 +682,7 @@ + NV_TIMERS +@@ -677,7 +693,7 @@ print_neighbor_msgstats(struct peer *p) } void |