Merge branch 'bugfix_warnings' into bfgminer

Conflicts:
	sha256_via.c

driver-cpu.c

@@ -67,7 +67,7 @@ static inline void drop_policy(void)
 {
 }
 
-static inline void affine_to_cpu(int id, int cpu)
+static inline void affine_to_cpu(__maybe_unused int id, __maybe_unused int cpu)
 {
 }
 #endif
@@ -764,7 +764,7 @@ static bool cpu_thread_prepare(struct thr_info *thr)
 	return true;
 }
 
-static uint64_t cpu_can_limit_work(struct thr_info *thr)
+static uint64_t cpu_can_limit_work(__maybe_unused struct thr_info *thr)
 {
 	return 0xfffff;
 }

sha256_via.c

@@ -19,9 +19,9 @@ static void via_sha256(void *hash, void *buf, unsigned len)
 		     :"memory");
 }
 
-bool scanhash_via(struct thr_info*thr, const unsigned char *pmidstate,
+bool scanhash_via(struct thr_info*thr, __maybe_unused const unsigned char *pmidstate,
 	unsigned char *data_inout,
-	unsigned char *phash1, unsigned char *phash,
+	__maybe_unused unsigned char *phash1, __maybe_unused unsigned char *phash,
 	const unsigned char *target,
 		  uint32_t max_nonce, uint32_t *last_nonce,
 		  uint32_t n)