fix_build_kfreebsd

Gbp-Pq: Name 0005-fix_build_kfreebsd.patch

diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc
index dccb4c22300308cf94815c7cc0c2747ee01acd5a..6a8c45ea08aa69382f86dfcbe298af766473e3b5 100644 (file)
--- a/plugins/tcpinfo/tcpinfo.cc
+++ b/plugins/tcpinfo/tcpinfo.cc
@@ -136,7 +136,7 @@ log_tcp_info(Config *config, const char *event_name, TSHttpSsn ssnp)
   TSReturnCode ret;
 
   if (config->log_level == 2) {
-#if !defined(freebsd) || defined(__GLIBC__)
+#if !defined(kfreebsd) && (!defined(freebsd) || defined(__GLIBC__))
     ret = TSTextLogObjectWrite(config->log, "%s %s %s %u %u %u %u %u %u %u %u %u %u %u %u %u", event_name, client_str, server_str,
                                info.tcpi_rtt, info.tcpi_rttvar, info.tcpi_last_data_sent, info.tcpi_last_data_recv,
                                info.tcpi_snd_cwnd, info.tcpi_snd_ssthresh, info.tcpi_rcv_ssthresh, info.tcpi_unacked,

diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 075d9596565dbec0204f61647b845b2af2135272..d4fd41115e801f9d5b79faef30c10ecb960da53c 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 dcbc076874b9e8dc560a41217b5ed9bd5a44d954..6f2f4230be798ae97daf513369a424de7958355c 100644 (file)
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -897,7 +897,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__)

diff --git a/src/tscore/ink_memory.cc b/src/tscore/ink_memory.cc
index 5419d62782887ce5d1624b3e3b001556abfedd6a..7ba65bd696d6b990f4aabd16354805306ac036bc 100644 (file)
--- a/src/tscore/ink_memory.cc
+++ b/src/tscore/ink_memory.cc
@@ -27,7 +27,7 @@
 #include "tscore/Diags.h"
 #include "tscore/ink_atomic.h"
 
-#if defined(freebsd)
+#if !defined(kfreebsd) && defined(freebsd)
 #include <malloc_np.h> // for malloc_usable_size
 #endif