From 18609e296f5489d93889fad1b47ff834d3a53e6f Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Tue, 20 Feb 2024 20:14:10 +0400 Subject: [PATCH 1/3] attempt to fix build for macos --- src/crypto/tree-hash.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/crypto/tree-hash.c b/src/crypto/tree-hash.c index b700e64a..2909f319 100644 --- a/src/crypto/tree-hash.c +++ b/src/crypto/tree-hash.c @@ -8,8 +8,9 @@ #include #include "hash-ops.h" -#include "malloc.h" - +#ifdef _M_ARM64 + #include "malloc.h" +#endif void tree_hash(const char (*hashes)[HASH_SIZE], size_t count, char *root_hash) { assert(count > 0); if (count == 1) { From 033ef5c9dc10977e4f97f29f7a7f1df99f240394 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Tue, 20 Feb 2024 20:56:10 +0400 Subject: [PATCH 2/3] noncense commit --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a151f1ea..4d3339ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5) PROJECT(Zano) - -set(VERSION "1.0") +set(VERSION "2.0") if(POLICY CMP0043) cmake_policy(SET CMP0043 NEW) From 47df89bdd8118e78c11ce53aac6526ca17d9ca72 Mon Sep 17 00:00:00 2001 From: zano build machine Date: Wed, 21 Feb 2024 14:23:19 +0300 Subject: [PATCH 3/3] === build number: 263 -> 264 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 4009c8c5..410adb6d 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "0" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 263 +#define PROJECT_VERSION_BUILD_NO 264 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"