diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-10 12:55:06 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-11 09:29:33 +0200 |
| commit | 104304864887f0e3765bb28333dc7b9bd991aa4f (patch) | |
| tree | c1472d363822507fba1cebca8fb18f611accd51b /freebsd/contrib/tcpdump/nlpid.c | |
| parent | Update CONTRIBUTING.md (diff) | |
| download | rtems-libbsd-104304864887f0e3765bb28333dc7b9bd991aa4f.tar.bz2 | |
tcpdump: Update to FreeBSD head 2017-04-04
Update tcpdump from Git mirror commit
99a648a912e81e29d9c4c159cbbe263462f2d719 to
642b174daddbd0efd9bb5f242c43f4ab4db6869f.
Diffstat (limited to 'freebsd/contrib/tcpdump/nlpid.c')
| -rw-r--r-- | freebsd/contrib/tcpdump/nlpid.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/freebsd/contrib/tcpdump/nlpid.c b/freebsd/contrib/tcpdump/nlpid.c index 83bfedf0..bd443eb4 100644 --- a/freebsd/contrib/tcpdump/nlpid.c +++ b/freebsd/contrib/tcpdump/nlpid.c @@ -1,6 +1,9 @@ #include <machine/rtems-bsd-user-space.h> - -/* +#ifdef __rtems__ +#include <machine/rtems-bsd-program.h> +#include "rtems-bsd-tcpdump-namespace.h" +#endif /* __rtems__ */ +/* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that: (1) source code * distributions retain the above copyright notice and this paragraph @@ -15,17 +18,12 @@ * Original code by Hannes Gredler (hannes@juniper.net) */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/nlpid.c,v 1.4 2004-10-19 15:27:55 hannes Exp $ (LBL)"; -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <tcpdump-stdinc.h> -#include "interface.h" +#include <netdissect-stdinc.h> +#include "netdissect.h" #include "nlpid.h" const struct tok nlpid_values[] = { @@ -46,3 +44,6 @@ const struct tok nlpid_values[] = { { NLPID_IP6, "IPv6" }, { 0, NULL } }; +#ifdef __rtems__ +#include "rtems-bsd-tcpdump-nlpid-data.h" +#endif /* __rtems__ */ |