kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-01-27 07:14:48 +00:00
Code Issues Projects Releases Wiki Activity

Fixed MacOS Catalina build.

Browse Source
This commit is contained in:
Just Wonder 2020-01-17 16:14:42 -08:00
parent 4df2c1d6cd
commit c72ef98577
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -357,7 +357,7 @@ libbitcoin_common_a_SOURCES = \
$(BITCOIN_CORE_H) $(BITCOIN_CORE_H)
# cnutils: shared between bitcoind, and bitcoin-qt and non-server tools # cnutils: shared between bitcoind, and bitcoin-qt and non-server tools
libbitcoin_cnutils_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cn_utils -I$(srcdir)/cn_utils/contrib -I$(srcdir)/cn_utils/external/easylogging++ -I$(srcdir)/cn_utils/contrib/epee/include libbitcoin_cnutils_a_CPPFLAGS = $(AM_CPPFLAGS) $(SSL_CFLAGS) -I$(srcdir)/cn_utils -I$(srcdir)/cn_utils/contrib -I$(srcdir)/cn_utils/external/easylogging++ -I$(srcdir)/cn_utils/contrib/epee/include
libbitcoin_cnutils_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_cnutils_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_cnutils_a_CFLAGS = $(PIC_FLAGS) libbitcoin_cnutils_a_CFLAGS = $(PIC_FLAGS)
libbitcoin_cnutils_a_SOURCES = \ libbitcoin_cnutils_a_SOURCES = \

11
src/qt/macdockiconhandler.mm
View File

@ -32,11 +32,16 @@ bool dockClickHandler(id self,SEL _cmd,...) {
void setupDockClickHandler() { void setupDockClickHandler() {
Class cls = objc_getClass("NSApplication"); Class cls = objc_getClass("NSApplication");
id appInst = objc_msgSend((id)cls, sel_registerName("sharedApplication"));
// Fixed objc_msgSend mismatched arguments error.
typedef id (*send_type)(void*, SEL);
send_type typed_msgSend = (send_type)objc_msgSend;
id appInst = typed_msgSend((id)cls, sel_registerName("sharedApplication"));
if (appInst != nullptr) { if (appInst != nullptr) {
id delegate = objc_msgSend(appInst, sel_registerName("delegate")); id delegate = typed_msgSend(appInst, sel_registerName("delegate"));
Class delClass = (Class)objc_msgSend(delegate, sel_registerName("class")); Class delClass = (Class)typed_msgSend(delegate, sel_registerName("class"));
SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:"); SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
if (class_getInstanceMethod(delClass, shouldHandle)) if (class_getInstanceMethod(delClass, shouldHandle))
class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:"); class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:");

4
src/rpc/blockchain.cpp
View File

@ -1461,8 +1461,8 @@ UniValue get_info(const JSONRPCRequest& request)
obj.push_back(Pair("mainnet", Params().NetworkIDString() == "main")); obj.push_back(Pair("mainnet", Params().NetworkIDString() == "main"));
obj.push_back(Pair("testnet", Params().NetworkIDString() == "test")); obj.push_back(Pair("testnet", Params().NetworkIDString() == "test"));
obj.push_back(Pair("height", (int)chainActive.Height())); obj.push_back(Pair("height", (int)chainActive.Height()));
obj.push_back(Pair("incoming_connections_count", g_connman->GetNodeCount(CConnman::CONNECTIONS_IN))); obj.push_back(Pair("incoming_connections_count", (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_IN)));
obj.push_back(Pair("outgoing_connections_count", g_connman->GetNodeCount(CConnman::CONNECTIONS_OUT))); obj.push_back(Pair("outgoing_connections_count", (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_OUT)));
obj.push_back(Pair("difficulty", (uint64_t)round(GetDifficulty()))); obj.push_back(Pair("difficulty", (uint64_t)round(GetDifficulty())));
obj.push_back(Pair("tx_pool_size", (int64_t) mempool.size())); obj.push_back(Pair("tx_pool_size", (int64_t) mempool.size()));
obj.push_back(Pair("status", "OK")); obj.push_back(Pair("status", "OK"));