From 8c3623fe1005e257c8cbfc348450cb6a4c077e1f Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 23 Sep 2016 10:36:28 -0300 Subject: [PATCH] syntax fixes --- src/komodo.h | 6 +++--- src/main.cpp | 2 +- src/pow.cpp | 2 +- src/rpcmining.cpp | 2 ++ src/txdb.cpp | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index f43a48da6..a70fed925 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -21,18 +21,18 @@ int32_t IS_KOMODO_NOTARY; -int32_t "C" komodo_is_notaryblock(void *block) +int32_t komodo_is_notaryblock(void *block) { return(0); } -int32_t "C" komodo_checkmsg(void *bitcoinpeer,uint8_t *data,int32_t datalen) +int32_t komodo_checkmsg(void *bitcoinpeer,uint8_t *data,int32_t datalen) { fprintf(stderr,"KOMODO.[%d] message from peer.%p\n",datalen,bitcoinpeer); return(0); } -int32_t "C" komodo_blockcheck(void *block,uint32_t *nBitsp) +int32_t komodo_blockcheck(void *block,uint32_t *nBitsp) { //fprintf(stderr,"check block %p\n",block); // 1 -> valid notary block, change nBits to KOMODO_MINDIFF_NBITS diff --git a/src/main.cpp b/src/main.cpp index 880394ea7..c2959ed4c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,7 +41,7 @@ using namespace std; # error "Bitcoin cannot be compiled without assertions." #endif -extern "C" int32_t komodo_blockcheck(void *block,uint32_t *nBitsp); +extern int32_t komodo_blockcheck(void *block,uint32_t *nBitsp); /** * Global state diff --git a/src/pow.cpp b/src/pow.cpp index c82138287..2ecff71cc 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -16,7 +16,7 @@ #include "sodium.h" -extern int32_t "C" komodo_is_notaryblock(void *pblock); +int32_t komodo_is_notaryblock(void *pblock); unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params) { diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 536c02eca..8fbf8a2df 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -115,6 +115,8 @@ Value getgenerate(const Array& params, bool fHelp) return GetBoolArg("-gen", false); } +int32_t komodo_blockcheck(void *block,uint32_t *nBitsp); + Value generate(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 1) diff --git a/src/txdb.cpp b/src/txdb.cpp index 1e45a9985..613f56df8 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -266,6 +266,8 @@ bool CBlockTreeDB::ReadFlag(const std::string &name, bool &fValue) { return true; } +int32_t komodo_blockcheck(void *block,uint32_t *nBitsp); + bool CBlockTreeDB::LoadBlockIndexGuts() { boost::scoped_ptr pcursor(NewIterator());