summaryrefslogtreecommitdiffstats
path: root/contrib/ipfilter/radix.c
diff options
context:
space:
mode:
authordarrenr <darrenr@FreeBSD.org>2007-10-18 21:52:14 +0000
committerdarrenr <darrenr@FreeBSD.org>2007-10-18 21:52:14 +0000
commitfd172ed3272b523c5499832d7098b6766bac7e4f (patch)
tree7eb0ed562f560c2289c5b113e742797727d126db /contrib/ipfilter/radix.c
parent6f755e940898e80d77f95031600e671c36e0a7a6 (diff)
downloadFreeBSD-src-fd172ed3272b523c5499832d7098b6766bac7e4f.zip
FreeBSD-src-fd172ed3272b523c5499832d7098b6766bac7e4f.tar.gz
Pullup IPFilter 4.1.28 from the vendor branch into HEAD.
MFC after: 7 days
Diffstat (limited to 'contrib/ipfilter/radix.c')
-rw-r--r--contrib/ipfilter/radix.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/ipfilter/radix.c b/contrib/ipfilter/radix.c
index e0c69ed..8c67562 100644
--- a/contrib/ipfilter/radix.c
+++ b/contrib/ipfilter/radix.c
@@ -76,8 +76,14 @@ void panic __P((char *str));
#include <netinet/in.h>
#include <sys/socket.h>
#include <net/if.h>
+#ifdef SOLARIS2
+# define _RADIX_H_
+#endif
#include "netinet/ip_compat.h"
#include "netinet/ip_fil.h"
+#ifdef SOLARIS2
+# undef _RADIX_H_
+#endif
/* END OF INCLUDES */
#include "radix_ipf.h"
#ifndef min
OpenPOWER on IntegriCloud