From e0402a38577e0755dd8604faf9622a06d0e052fe Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Thu, 11 Mar 2021 14:11:27 +0700
Subject: [PATCH] [*] MacOS Catalina build errors fix [*] Removed useless
length variability for wallet struct y
---
dap-sdk/net/core/dap_proc_thread.c | 4 ++++
dap-sdk/net/core/dap_worker.c | 5 +++++
dap-sdk/net/core/include/dap_worker.h | 1 +
modules/wallet/include/dap_chain_wallet_internal.h | 1 -
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dap-sdk/net/core/dap_proc_thread.c b/dap-sdk/net/core/dap_proc_thread.c
index cfa487b5a6..a38fcfdb53 100644
--- a/dap-sdk/net/core/dap_proc_thread.c
+++ b/dap-sdk/net/core/dap_proc_thread.c
@@ -43,6 +43,10 @@ typedef cpuset_t cpu_set_t; // Adopt BSD CPU setstructure to POSIX variant
#define NOTE_READ NOTE_LOWAT
#endif
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
#else
#error "Unimplemented poll for this platform"
#endif
diff --git a/dap-sdk/net/core/dap_worker.c b/dap-sdk/net/core/dap_worker.c
index 47c2a774e3..9467b64728 100644
--- a/dap-sdk/net/core/dap_worker.c
+++ b/dap-sdk/net/core/dap_worker.c
@@ -38,6 +38,11 @@
#ifdef DAP_OS_DARWIN
#define NOTE_READ NOTE_LOWAT
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
#endif
#include "dap_common.h"
diff --git a/dap-sdk/net/core/include/dap_worker.h b/dap-sdk/net/core/include/dap_worker.h
index ea74cda3c9..4da7c9cff0 100644
--- a/dap-sdk/net/core/include/dap_worker.h
+++ b/dap-sdk/net/core/include/dap_worker.h
@@ -28,6 +28,7 @@
#include "dap_common.h"
#include "dap_events_socket.h"
+
typedef struct dap_proc_queue dap_proc_queue_t;
typedef struct dap_timerfd dap_timerfd_t;
typedef struct dap_worker
diff --git a/modules/wallet/include/dap_chain_wallet_internal.h b/modules/wallet/include/dap_chain_wallet_internal.h
index 9ddb64b2f8..0256080f4c 100644
--- a/modules/wallet/include/dap_chain_wallet_internal.h
+++ b/modules/wallet/include/dap_chain_wallet_internal.h
@@ -47,7 +47,6 @@ typedef struct dap_chain_wallet_file_hdr{
uint32_t version;
uint8_t type; /// Wallets storage type 0x00 - uncompressed and unencrypted
uint64_t padding;
- uint8_t certs[];
} DAP_ALIGN_PACKED dap_chain_wallet_file_hdr_t;
typedef struct dap_chain_wallet_file
--
GitLab