From: Aron Xu <aron@debian.org>
Date: Mon, 6 Aug 2018 08:56:14 +0000 (+0100)
Subject: fix_build_kfreebsd
X-Git-Tag: archive/raspbian/8.0.2+ds-1+rpi1~1^2^2^2^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0d310b3985da494867a727e463a99c44e426f18d;p=trafficserver.git

fix_build_kfreebsd


Gbp-Pq: Name 0007-fix_build_kfreebsd.patch
---

diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc
index 4d40b737..cf6e173d 100644
--- a/lib/ts/ink_memory.cc
+++ b/lib/ts/ink_memory.cc
@@ -27,7 +27,7 @@
 #include "ts/Diags.h"
 #include "ts/ink_atomic.h"
 
-#if defined(freebsd)
+#if !defined(kfreebsd) && defined(freebsd)
 #include <malloc_np.h> // for malloc_usable_size
 #endif
 
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 250edf10..cf2d45ac 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -126,7 +126,7 @@ plugin_load(int argc, char *argv[], bool validateOnly)
       return false; // this line won't get called since Fatal brings down ATS
     }
 
-#if defined(freebsd) || defined(darwin)
+#if (!defined(kfreebsd) && defined(freebsd)) || defined(darwin)
     optreset = 1;
 #endif
 #if defined(__GLIBC__)
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index d528c1f8..7db321a0 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -919,7 +919,7 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
   void *ih         = nullptr;
   TSReturnCode res = TS_SUCCESS;
   if (pi->fp_tsremap_new_instance) {
-#if defined(freebsd) || defined(darwin)
+#if (!defined(kfreebsd) && defined(freebsd)) || defined(darwin)
     optreset = 1;
 #endif
 #if defined(__GLIBC__)