From 2f324fc446f451796099900226f8854e79c0a571 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Sun, 11 Oct 2015 10:12:36 -0700 Subject: [PATCH] Fix midnight coding issues. --- src/crypto/sha2/asm/sha2-x86.S | 4 ++-- src/rpcmining.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crypto/sha2/asm/sha2-x86.S b/src/crypto/sha2/asm/sha2-x86.S index 044630f..c66ef09 100644 --- a/src/crypto/sha2/asm/sha2-x86.S +++ b/src/crypto/sha2/asm/sha2-x86.S @@ -1200,12 +1200,12 @@ _sha256_use_ssse3: movl $1, %eax cpuid andl $0x00000200, %ecx - jnz sha256_use_ssse3 + jnz sha256_use_ssse3_done xorl %eax, %eax popl %ebx ret -sha256_use_ssse3: +sha256_use_ssse3_done: movl $1, %eax popl %ebx ret diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 63b4e37..a9972c6 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -101,7 +101,7 @@ Value scaninput(const Array& params, bool fHelp) uint32_t nBits = GetNextTargetRequired(pindexBest, true); const Value& diff_v = find_value(scanParams, "difficulty"); - if (diff_v.type() == real_type) + if (diff_v.type() == real_type || diff_v.type() == int_type) { double dDiff = diff_v.get_real(); if (dDiff <= 0) -- 1.7.1