diff options
| author | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
|---|---|---|
| committer | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
| commit | 25508d6cfbafa0e186ef2b9a5b8fc683b1aef865 (patch) | |
| tree | 9209f38a8bc3af0186363bc8bbfe05d79337f8d4 /contrib/ipfilter/radix_ipf.h | |
| parent | d362c40d3a43c5e377ec90dd140a98e109e6b285 (diff) | |
| download | src-25508d6cfbafa0e186ef2b9a5b8fc683b1aef865.tar.gz src-25508d6cfbafa0e186ef2b9a5b8fc683b1aef865.zip | |
Resolve conflicts (and believe me...you don't want to know).
Notes
Notes:
svn path=/head/; revision=153881
Diffstat (limited to 'contrib/ipfilter/radix_ipf.h')
| -rw-r--r-- | contrib/ipfilter/radix_ipf.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/contrib/ipfilter/radix_ipf.h b/contrib/ipfilter/radix_ipf.h index cc046fedb986..294407b612b0 100644 --- a/contrib/ipfilter/radix_ipf.h +++ b/contrib/ipfilter/radix_ipf.h @@ -28,7 +28,7 @@ * @(#)radix.h 8.2 (Berkeley) 10/31/94 */ -#ifndef _NET_RADIX_H_ +#if !defined(_NET_RADIX_H_) && !defined(_RADIX_H_) #define _NET_RADIX_H_ #ifndef _RADIX_H_ #define _RADIX_H_ @@ -42,7 +42,7 @@ # endif #endif -#ifdef __sgi +#if defined(__sgi) # define radix_mask ipf_radix_mask # define radix_node ipf_radix_node # define radix_node_head ipf_radix_node_head @@ -146,6 +146,12 @@ struct radix_node_head { }; +#if defined(AIX) +# undef Bcmp +# undef Bzero +# undef R_Malloc +# undef Free +#endif #define Bcmp(a, b, n) bcmp(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n)) #if defined(linux) && defined(_KERNEL) # define Bcopy(a, b, n) memmove(((caddr_t)(b)), ((caddr_t)(a)), (unsigned)(n)) @@ -157,7 +163,7 @@ struct radix_node_head { #define FreeS(p, z) KFREES(p, z) #define Free(p) KFREE(p) -#if (defined(__osf__) || (IRIX >= 60516)) && defined(_KERNEL) +#if (defined(__osf__) || defined(AIX) || (IRIX >= 60516)) && defined(_KERNEL) # define rn_init ipf_rn_init # define rn_fini ipf_rn_fini # define rn_inithead ipf_rn_inithead |