From 2b98716520998db68189c7e6582d9fa1233fd31a Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 18 Sep 2008 22:39:48 +1200 Subject: [PATCH] Author: Hasso Tepper Bug 2465: Support for DragonFly BSD Part 1, this covers all the known code changes. Bootstrap auto-tools system still needs an update to discover the OS properly. See Bug report for details. --- include/config.h | 5 ++++- src/ACLARP.cc | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/config.h b/include/config.h index 9c2b2479cd..cfc7d76dd4 100644 --- a/include/config.h +++ b/include/config.h @@ -111,6 +111,9 @@ #elif defined(__OpenBSD__) #define _SQUID_OPENBSD_ +#elif defined(__DragonFly__) +#define _SQUID_DRAGONFLY_ + #elif defined(__CYGWIN32__) || defined(__CYGWIN__) #define _SQUID_CYGWIN_ #define _SQUID_WIN32_ @@ -340,7 +343,7 @@ typedef union { /* * Don't allow inclusion of malloc.h on FreeBSD, Next and OpenBSD */ -#if defined(HAVE_MALLOC_H) && (defined(_SQUID_FREEBSD_) || defined(_SQUID_NEXT_) || defined(_SQUID_OPENBSD_)) +#if defined(HAVE_MALLOC_H) && (defined(_SQUID_FREEBSD_) || defined(_SQUID_NEXT_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_DRAGONFLY_)) #undef HAVE_MALLOC_H #endif diff --git a/src/ACLARP.cc b/src/ACLARP.cc index 1af39c43ad..2b866e6049 100644 --- a/src/ACLARP.cc +++ b/src/ACLARP.cc @@ -67,7 +67,7 @@ struct arpreq #endif #include #include -#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) +#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_DRAGONFLY_) #include #endif #if HAVE_NETINET_IF_ETHER_H @@ -438,7 +438,7 @@ aclMatchArp(SplayNode **dataptr, struct IN_ADDR c) return (0 == splayLastResult); } -#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) +#elif defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_DRAGONFLY_) struct arpreq arpReq; -- 2.47.2