Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'develop' into release

Browse source
This commit is contained in:
sowle 2024-02-21 12:24:11 +01:00
commit 04692e5fc4
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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)

5
src/crypto/tree-hash.c
View file

@ -8,8 +8,9 @@
#include <string.h>
#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) {

2
src/version.h.in
View file

@ -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 "]"