Author: Hasso Tepper <hasso@estpak.ee>

Bug 2465: Support for DragonFly BSD

diff --git a/include/config.h b/include/config.h
index acd05a1e215d30ca27512a4abb6a67d1f736f489..cd7fb1a037635b44dbb475f591ade423a7e91389 100644 (file)
--- 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_
@@ -332,7 +335,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 ee008dd0b6ec743e8ff8d2d3ce0427f95cd419fa..58918ff9ac5da6374e2d53fb072f918e000c3b39 100644 (file)
--- a/src/ACLARP.cc
+++ b/src/ACLARP.cc
@@ -69,7 +69,7 @@ struct arpreq
 #endif
 #include <net/route.h>
 #include <net/if.h>
-#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_)
+#if defined(_SQUID_FREEBSD_) || defined(_SQUID_NETBSD_) || defined(_SQUID_OPENBSD_) || defined(_SQUID_DRAGONFLY_)
 #include <net/if_arp.h>
 #endif
 #if HAVE_NETINET_IF_ETHER_H
@@ -439,7 +439,7 @@ aclMatchArp(SplayNode<acl_arp_data *> **dataptr, IPAddress &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_)
 
     SplayNode<acl_arp_data *> **Top = dataptr;