Author: Hasso Tepper <hasso@estpak.ee>

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.

diff --git a/include/config.h b/include/config.h
index 9c2b2479cdf89f3d25adecd93f4d36c11bb7df41..cfc7d76dd43f4f5a78dcaa1a2e2623c100a765d0 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_
@@ -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 1af39c43adcada44a842e8dbbf825b78ada87ea5..2b866e604996026b96a0fd1d8bcc3503ff6ea06a 100644 (file)
--- a/src/ACLARP.cc
+++ b/src/ACLARP.cc
@@ -67,7 +67,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
@@ -438,7 +438,7 @@ aclMatchArp(SplayNode<acl_arp_data *> **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;