diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-12-15 14:36:35 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-12-15 14:36:35 +0200 |
commit | 29735c8f8fda032833924285c2da7ea9b15a77c7 (patch) | |
tree | 6be858f3fd0b29be74c87ba37e3512f3a4808acf /tests | |
parent | Merge pull request #1458 (diff) | |
parent | Preliminary support for DragonFly BSD (diff) | |
download | monero-29735c8f8fda032833924285c2da7ea9b15a77c7.tar.xz |
Merge pull request #1459
b00da61e Preliminary support for DragonFly BSD (Antonio Huete Jimenez)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/performance_tests/performance_utils.h | 4 | ||||
-rw-r--r-- | tests/unit_tests/slow_memmem.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/performance_tests/performance_utils.h b/tests/performance_tests/performance_utils.h index ba2b71740..487caa676 100644 --- a/tests/performance_tests/performance_utils.h +++ b/tests/performance_tests/performance_utils.h @@ -40,7 +40,7 @@ void set_process_affinity(int core) { -#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) return; #elif defined(BOOST_WINDOWS) DWORD_PTR mask = 1; @@ -62,7 +62,7 @@ void set_process_affinity(int core) void set_thread_high_priority() { -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) return; #elif defined(BOOST_WINDOWS) ::SetPriorityClass(::GetCurrentProcess(), HIGH_PRIORITY_CLASS); diff --git a/tests/unit_tests/slow_memmem.cpp b/tests/unit_tests/slow_memmem.cpp index a14e01885..d36b9f532 100644 --- a/tests/unit_tests/slow_memmem.cpp +++ b/tests/unit_tests/slow_memmem.cpp @@ -36,7 +36,8 @@ #include "gtest/gtest.h" // OS X, FreeBSD, and OpenBSD don't need malloc.h -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && \ + !defined(__DragonFly__) #include <malloc.h> #endif |