Merge branch 'bugfix_warnings201209' into bfgminer

api.c

@@ -1697,7 +1697,7 @@ static void pgaidentify(__maybe_unused SOCKETTYPE c, char *param, bool isjson, _
 	}
 
 	struct cgpu_info *cgpu = devices[dev];
-	struct device_api *api = cgpu->api;
+	const struct device_api *api = cgpu->api;
 
 	if (api->identify_device && api->identify_device(cgpu))
 		strcpy(io_buffer, message(MSG_PGAIDENT, id, NULL, isjson));

driver-cpu.c

@@ -233,7 +233,7 @@ double bench_algo_stage3(
 	memset(&work, 0, sizeof(work));
 	memcpy(&work, &bench_block, min_size);
 
-	struct thr_info dummy = {0};
+	static struct thr_info dummy;
 
 	struct timeval end;
 	struct timeval start;

libblkmaker

@@ -1 +1 @@
-Subproject commit 7f153402d6699d6748fc3ac6585c9076375c4b53
+Subproject commit 071714935be4ba45853ef1b56e656a9527eb5fc4

miner.h

@@ -694,6 +694,7 @@ extern int restart_wait(unsigned int mstime);
 extern int stale_wait(unsigned int mstime, struct work*, bool checkend);
 
 extern void kill_work(void);
+extern void app_restart(void);
 
 extern void reinit_device(struct cgpu_info *cgpu);
 

ocl.c

@@ -295,7 +295,7 @@ int clDevicesNum(void) {
 		status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices);
 		if (status != CL_SUCCESS) {
 			applog(LOG_ERR, "Error %d: Getting Device IDs (num)", status);
-			if (i != opt_platform_id)
+			if ((int)i != opt_platform_id)
 				continue;
 			return -1;
 		}