diff --git a/core/src/core.cpp b/core/src/core.cpp index 6b7cd03f..3117d809 100644 --- a/core/src/core.cpp +++ b/core/src/core.cpp @@ -19,7 +19,7 @@ #include "../../tests/test_utils.h" -#ifdef __APPLE__ +#if defined (__APPLE__) || defined (__FreeBSD__) #include #include #include diff --git a/core/src/json.hpp b/core/src/json.hpp index 6a0f47ab..1b365216 100644 --- a/core/src/json.hpp +++ b/core/src/json.hpp @@ -16747,6 +16747,8 @@ class basic_json result["platform"] = "win32"; #elif defined __linux__ result["platform"] = "linux"; +#elif defined __FreeBSD__ + result["platform"] = "freebsd"; #elif defined __APPLE__ result["platform"] = "apple"; #elif defined __unix__ diff --git a/core/src/server.cpp b/core/src/server.cpp index 243b3134..71305c87 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -18,7 +18,7 @@ #include "dsp/multirate/rational_resampler.h" #include -#ifdef __linux__ +#if defined (__linux__) || defined (__FreeBSD__) #include #include #endif diff --git a/core/src/utils/proto/http.cpp b/core/src/utils/proto/http.cpp index f2ee628a..0a078ef1 100644 --- a/core/src/utils/proto/http.cpp +++ b/core/src/utils/proto/http.cpp @@ -172,7 +172,7 @@ namespace net::http { std::string Client::get_https(const std::string &url) { return ::backend::httpGet(url); } -#elif defined(__linux__) +#elif defined(__linux__) || defined (__FreeBSD__) std::string Client::get_https(const std::string &url) { FILE *stuff = popen(("curl -k '"+url+"'").c_str(), "r"); diff --git a/core/src/utils/usleep.h b/core/src/utils/usleep.h index 14c8b161..3fd71787 100644 --- a/core/src/utils/usleep.h +++ b/core/src/utils/usleep.h @@ -1,6 +1,6 @@ #pragma once -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) #include #endif diff --git a/misc_modules/noise_reduction_logmmse/src/bgnoise.h b/misc_modules/noise_reduction_logmmse/src/bgnoise.h index 4c0230d1..e91cee85 100644 --- a/misc_modules/noise_reduction_logmmse/src/bgnoise.h +++ b/misc_modules/noise_reduction_logmmse/src/bgnoise.h @@ -45,7 +45,8 @@ public: buckets.resize(NBUCKETS); memset(buckets.data(), 0, sizeof(int) * NBUCKETS); for(auto f : logFrame) { - int bucket = (int) (NBUCKETS * ((f - minn) / width)); + /* 'bucket' index must be clamped at 999 to not overflow array */ + int bucket = (int) ((NBUCKETS - 1) * ((f - minn) / width)); buckets[bucket]++; } auto ix = std::max_element(buckets.begin(), buckets.end()) - buckets.begin(); @@ -59,4 +60,4 @@ public: } -}; \ No newline at end of file +}; diff --git a/misc_modules/tci_server/src/websocket.h b/misc_modules/tci_server/src/websocket.h index d677ab6b..cb5c24d2 100644 --- a/misc_modules/tci_server/src/websocket.h +++ b/misc_modules/tci_server/src/websocket.h @@ -137,7 +137,9 @@ namespace websocket { #else flags = MSG_NOSIGNAL; #ifndef __APPLE__ +#ifndef __FreeBSD__ if (more) flags |= MSG_MORE; +#endif #endif #endif do { @@ -828,4 +830,4 @@ namespace websocket { Connection conns_data_[MaxConns]; }; -} // namespace websocket \ No newline at end of file +} // namespace websocket diff --git a/source_modules/hl2_source/src/hl2_device.h b/source_modules/hl2_source/src/hl2_device.h index 0dc544aa..c1911d4a 100644 --- a/source_modules/hl2_source/src/hl2_device.h +++ b/source_modules/hl2_source/src/hl2_device.h @@ -16,9 +16,10 @@ #include #endif -#ifdef __APPLE__ +#if defined (__APPLE__) || defined (__FreeBSD__) #include #include +#include #include #include