Merge commit '81b88e3' into bfgminer-2.10.x

Conflicts:
	miner.c

api.c

@@ -1426,7 +1426,9 @@ static void minerconfig(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __
 	root = api_add_int(root, "ScanTime", &opt_scantime, false);
 	root = api_add_int(root, "Queue", &opt_queue, false);
 	root = api_add_int(root, "Expiry", &opt_expiry, false);
+#if BLKMAKER_VERSION > 0
 	root = api_add_string(root, "Coinbase-Sig", opt_coinbase_sig, true);
+#endif
 
 	root = print_data(root, buf, isjson, false);
 	io_add(io_data, buf);
@@ -2991,12 +2993,14 @@ static void setconfig(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char
 
 	*(comma++) = '\0';
 
+#if BLKMAKER_VERSION > 0
 	if (strcasecmp(param, "coinbase-sig") == 0) {
 		free(opt_coinbase_sig);
 		opt_coinbase_sig = strdup(comma);
 		message(io_data, MSG_SETCONFIG, 1, param, isjson);
 		return;
 	}
+#endif
 
 	value = atoi(comma);
 	if (value < 0 || value > 9999) {

miner.c

@@ -104,10 +104,9 @@ struct _cbscript_t {
 static struct _cbscript_t opt_coinbase_script;
 static uint32_t template_nonce;
 #endif
-#if BLKMAKER_VERSION < 1
-const
-#endif
+#if BLKMAKER_VERSION > 0
 char *opt_coinbase_sig;
+#endif
 static bool want_stratum = true;
 bool have_longpoll;
 int opt_skip_checks;