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 4d40b737d05f339567e45f2b572fac47b4a97653..cf6e173d819c639ccdb5120e003409bcffcee86a 100644 (file)
--- 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 250edf1078c6760a9343aeee9916c8c0ca2a3be6..cf2d45acd30b6f0183172c7a8800b5b56446590c 100644 (file)
--- 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 d528c1f82422a2561d17a36b90c90e34db6337bb..7db321a09279ea247ad7bf6d44d9dad441bfb5cd 100644 (file)
--- 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__)