Merge branch 'upstream_ccan' into bfgminer

Conflicts:
	miner.c

ccan-upstream

@@ -1 +1 @@
-Subproject commit 7471ecd79174306ee976a4ecc09cc2b9ebb4b501
+Subproject commit 8b0bdb090e2882aa431e89f4bc7aa4736e9e2838

miner.c

@@ -1127,34 +1127,6 @@ struct pool *current_pool(void)
 	return pool;
 }
 
-// Copied from ccan/opt/helpers.c
-static char *arg_bad(const char *fmt, const char *arg)
-{
-	char *str = malloc(strlen(fmt) + strlen(arg));
-	sprintf(str, fmt, arg);
-	return str;
-}
-
-static
-char *opt_set_floatval(const char *arg, float *f)
-{
-	char *endp;
-
-	errno = 0;
-	*f = strtof(arg, &endp);
-	if (*endp || !arg[0])
-		return arg_bad("'%s' is not a number", arg);
-	if (errno)
-		return arg_bad("'%s' is out of range", arg);
-	return NULL;
-}
-
-static
-void opt_show_floatval(char buf[OPT_SHOW_LEN], const float *f)
-{
-	snprintf(buf, OPT_SHOW_LEN, "%.1f", *f);
-}
-
 static
 char *set_bool_ignore_arg(const char * const arg, bool * const b)
 {