Skip to content

Fix build for kfreebsd architecture on Debian #4327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bryancall merged 1 commit into from
Oct 1, 2018
Merged

Fix build for kfreebsd architecture on Debian #4327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion proxy/Plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,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__)
Expand Down
2 changes: 1 addition & 1 deletion proxy/http/remap/RemapConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion src/tscore/ink_memory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down