Merge commit 'd90a625' into bfgminer

driver-cairnsmore.c

@@ -102,7 +102,7 @@ bool cairnsmore_supports_dynclock(int fd)
 			// Hashed the command, so it's not supported
 			return false;
 		default:
-			applog(LOG_WARNING, "Unexpected nonce from dynclock probe: %08x", be32toh(nonce));
+			applog(LOG_WARNING, "Unexpected nonce from dynclock probe: %08x", (uint32_t)be32toh(nonce));
 			return false;
 		case 0:
 			return true;

miner.c

@@ -2418,7 +2418,7 @@ void have_block_height(uint32_t block_id, uint32_t blkheight)
 {
 	if (known_blkheight == blkheight)
 		return;
-	applog(LOG_DEBUG, "Learned that block id %08" PRIx32 " is height %" PRIu32, be32toh(block_id), blkheight);
+	applog(LOG_DEBUG, "Learned that block id %08" PRIx32 " is height %" PRIu32, (uint32_t)be32toh(block_id), blkheight);
 	cg_wlock(&ch_lock);
 	known_blkheight = blkheight;
 	known_blkheight_blkid = block_id;