diff options
| author | mlaier <mlaier@FreeBSD.org> | 2004-02-28 17:32:53 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2004-02-28 17:32:53 +0000 |
| commit | cfa84beb14b57fb04e0c99796c7b1ef9f4719274 (patch) | |
| tree | c31333426907530b588b3b90bbec666e0c0bd647 /contrib/pf/pflogd | |
| parent | 80dc4d1b917ca6fab4a6f9dd6a58da889fd7b4dc (diff) | |
| download | FreeBSD-src-cfa84beb14b57fb04e0c99796c7b1ef9f4719274.zip FreeBSD-src-cfa84beb14b57fb04e0c99796c7b1ef9f4719274.tar.gz | |
Apply diff from the port.
Rather small diff for the userland (in contrast to the kernel):
- Some header file location/differences
- Clean compilation on 64bit arch (identified by bento a long time ago)
- ALTQ not (yet) available. Leave a switch for patchsets and future ...
- most files can be used from the vendor branch
Approved by: bms(in general)
Diffstat (limited to 'contrib/pf/pflogd')
| -rw-r--r-- | contrib/pf/pflogd/pflogd.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c index 9777f15..10d8816 100644 --- a/contrib/pf/pflogd/pflogd.c +++ b/contrib/pf/pflogd/pflogd.c @@ -1,3 +1,4 @@ +/* $FreeBSD$ */ /* $OpenBSD: pflogd.c,v 1.21 2003/08/22 21:50:34 david Exp $ */ /* @@ -44,7 +45,15 @@ #include <errno.h> #include <stdarg.h> #include <fcntl.h> +#if defined(__FreeBSD__) +#include "pidfile.h" +#else #include <util.h> +#endif + +#if defined(__FreeBSD__) +#define __dead __volatile +#endif #define DEF_SNAPLEN 116 /* default plus allow for larger header of pflog */ #define PCAP_TO_MS 500 /* pcap read timeout (ms) */ @@ -79,7 +88,11 @@ int reset_dump(void); void sig_alrm(int); void sig_close(int); void sig_hup(int); +#if defined(__FreeBSD__) +__volatile void usage(void); +#else void usage(void); +#endif char * |
