Browse Source

Update libblkmaker to 0.4.0

Luke Dashjr 11 years ago
parent
commit
e0ce95b264
2 changed files with 3 additions and 3 deletions
  1. 1 1
      libblkmaker
  2. 2 2
      miner.c

+ 1 - 1
libblkmaker

@@ -1 +1 @@
-Subproject commit 28b2ff02304ac8af8a045c26eef46b401ef78d58
+Subproject commit 385f2ddd7c11532d73175009d864dc646596c554

+ 2 - 2
miner.c

@@ -2795,7 +2795,7 @@ static double target_diff(const unsigned char *);
 
 #define GBT_XNONCESZ (sizeof(uint32_t))
 
-#if 1 // FIXME BLKMAKER_VERSION > 4
+#if BLKMAKER_VERSION > 4
 #define blkmk_append_coinbase_safe(tmpl, append, appendsz)  \
        blkmk_append_coinbase_safe2(tmpl, append, appendsz, GBT_XNONCESZ, false)
 #endif
@@ -2957,7 +2957,7 @@ static bool work_decode(struct pool *pool, struct work *work, json_t *val)
 
 	work->tv_staged = tv_now;
 	
-#if 1 // FIXME BLKMAKER_VERSION > 4
+#if BLKMAKER_VERSION > 4
 	if (work->tr)
 	{
 		blktemplate_t * const tmpl = work->tr->tmpl;