mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-25 12:15:32 +03:00
100 lines
3.1 KiB
Diff
100 lines
3.1 KiB
Diff
diff --git a/src/ripple/basics/StringUtilities.h b/src/ripple/basics/StringUtilities.h
|
|
index f4cc83f..d2aa4bd 100644
|
|
--- a/src/ripple/basics/StringUtilities.h
|
|
+++ b/src/ripple/basics/StringUtilities.h
|
|
@@ -26,6 +26,7 @@
|
|
#include <boost/format.hpp>
|
|
#include <sstream>
|
|
#include <string>
|
|
+#include <endian.h>
|
|
|
|
namespace ripple {
|
|
|
|
diff --git a/src/ripple/basics/base_uint.h b/src/ripple/basics/base_uint.h
|
|
index cfa6867..1ce4ec3 100644
|
|
--- a/src/ripple/basics/base_uint.h
|
|
+++ b/src/ripple/basics/base_uint.h
|
|
@@ -31,6 +31,7 @@
|
|
#include <ripple/basics/hardened_hash.h>
|
|
#include <ripple/beast/utility/Zero.h>
|
|
#include <boost/functional/hash.hpp>
|
|
+#include <endian.h>
|
|
#include <functional>
|
|
#include <type_traits>
|
|
|
|
diff --git a/src/rocksdb2/port/port_posix.cc b/src/rocksdb2/port/port_posix.cc
|
|
index c5ea439..b968571 100644
|
|
--- a/src/rocksdb2/port/port_posix.cc
|
|
+++ b/src/rocksdb2/port/port_posix.cc
|
|
@@ -29,7 +29,7 @@ static int PthreadCall(const char* label, int result) {
|
|
}
|
|
|
|
Mutex::Mutex(bool adaptive) {
|
|
-#ifdef OS_LINUX
|
|
+#ifdef ROCKSDB_PTHREAD_ADAPTIVE_MUTEX
|
|
if (!adaptive) {
|
|
PthreadCall("init mutex", pthread_mutex_init(&mu_, nullptr));
|
|
} else {
|
|
@@ -42,9 +42,9 @@ Mutex::Mutex(bool adaptive) {
|
|
PthreadCall("destroy mutex attr",
|
|
pthread_mutexattr_destroy(&mutex_attr));
|
|
}
|
|
-#else // ignore adaptive for non-linux platform
|
|
+#else
|
|
PthreadCall("init mutex", pthread_mutex_init(&mu_, nullptr));
|
|
-#endif // OS_LINUX
|
|
+#endif // ROCKSDB_PTHREAD_ADAPTIVE_MUTEX
|
|
}
|
|
|
|
Mutex::~Mutex() { PthreadCall("destroy mutex", pthread_mutex_destroy(&mu_)); }
|
|
diff --git a/src/rocksdb2/port/stack_trace.cc b/src/rocksdb2/port/stack_trace.cc
|
|
index 76866e6..542100c 100644
|
|
--- a/src/rocksdb2/port/stack_trace.cc
|
|
+++ b/src/rocksdb2/port/stack_trace.cc
|
|
@@ -8,7 +8,7 @@
|
|
namespace rocksdb {
|
|
namespace port {
|
|
|
|
-#if defined(ROCKSDB_LITE) || !(defined(OS_LINUX) || defined(OS_MACOSX))
|
|
+#if defined(ROCKSDB_LITE) || !(defined(__GLIBC__) || defined(OS_MACOSX))
|
|
|
|
// noop
|
|
|
|
diff --git a/src/rocksdb2/util/log_buffer.h b/src/rocksdb2/util/log_buffer.h
|
|
index 2a24bf8..ddaaa2c 100644
|
|
--- a/src/rocksdb2/util/log_buffer.h
|
|
+++ b/src/rocksdb2/util/log_buffer.h
|
|
@@ -9,6 +9,7 @@
|
|
#include "util/arena.h"
|
|
#include "util/autovector.h"
|
|
#include <ctime>
|
|
+#include <sys/time.h>
|
|
|
|
namespace rocksdb {
|
|
|
|
diff --git a/src/ripple/beast/core/SystemStats.cpp b/src/ripple/beast/core/SystemStats.cpp
|
|
index 74caa79..b238979 100644
|
|
--- a/src/ripple/beast/core/SystemStats.cpp
|
|
+++ b/src/ripple/beast/core/SystemStats.cpp
|
|
@@ -50,7 +50,7 @@ getStackBacktrace()
|
|
{
|
|
std::vector <std::string> result;
|
|
|
|
-#if BEAST_ANDROID || BEAST_MINGW || BEAST_BSD
|
|
+#if BEAST_ANDROID || BEAST_MINGW || BEAST_BSD || 1
|
|
assert(false); // sorry, not implemented yet!
|
|
|
|
#elif BEAST_WINDOWS
|
|
diff --git a/src/ripple/beast/core/core.unity.cpp b/src/ripple/beast/core/core.unity.cpp
|
|
index 83dd1df..b374634 100644
|
|
--- a/src/ripple/beast/core/core.unity.cpp
|
|
+++ b/src/ripple/beast/core/core.unity.cpp
|
|
@@ -113,7 +113,7 @@
|
|
#include <net/if.h>
|
|
#include <sys/ioctl.h>
|
|
|
|
- #if ! BEAST_ANDROID && ! BEAST_BSD
|
|
+ #if ! BEAST_ANDROID && ! BEAST_BSD && 0
|
|
#include <execinfo.h>
|
|
#endif
|
|
#endif
|