This is an automated email from the ASF dual-hosted git repository. bcall pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 101c31729f3af116f2756814daf812ea697b053f Author: Jean Baptiste Favre <[email protected]> AuthorDate: Thu Sep 27 10:26:59 2018 +0200 Fix build for kfreebsd architecture on Debian. Should preserve build for freebsd (cherry picked from commit b8d71fdec73d61b0bd5220f31ae4280a2c75fc49) --- proxy/Plugin.cc | 2 +- proxy/http/remap/RemapConfig.cc | 2 +- src/tscore/ink_memory.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc index 075d959..d4fd411 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 dcbc076..6f2f423 100644 --- 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 5419d62..7ba65bd 100644 --- 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
