diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-08-13 05:00:44 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-08-13 05:00:44 +0000 |
| commit | 100a11733cd237ac838ef096cde71c7a8b20be82 (patch) | |
| tree | 1b94a958495c7e0493a46b7b0310c343b6cfda20 /contrib/ipfilter/iplang | |
| parent | 8a085613071c599a6d5b98efa2b89b1573c97563 (diff) | |
| download | FreeBSD-src-100a11733cd237ac838ef096cde71c7a8b20be82.zip FreeBSD-src-100a11733cd237ac838ef096cde71c7a8b20be82.tar.gz | |
resolve conflicts
Diffstat (limited to 'contrib/ipfilter/iplang')
| -rw-r--r-- | contrib/ipfilter/iplang/iplang_y.y | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/contrib/ipfilter/iplang/iplang_y.y index 2809364..aa13e8f 100644 --- a/contrib/ipfilter/iplang/iplang_y.y +++ b/contrib/ipfilter/iplang/iplang_y.y @@ -49,7 +49,8 @@ #include "ipf.h" #include "iplang.h" -#if !defined(__NetBSD__) && !defined(__FreeBSD__) +#if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \ + __FreeBSD_version < 400020) extern struct ether_addr *ether_aton __P((char *)); #endif |
