Browse Source

Merge commit 'fefdb71' into bfgminer

Luke Dashjr 13 years ago
parent
commit
cc5d384f87
2 changed files with 2 additions and 2 deletions
  1. 1 1
      fpgautils.c
  2. 1 1
      miner.h

+ 1 - 1
fpgautils.c

@@ -92,7 +92,7 @@ int serial_autodetect_udev(__maybe_unused detectone_func_t detectone, __maybe_un
 }
 #endif
 
-int serial_autodetect_devserial(detectone_func_t detectone, const char*prodname)
+int serial_autodetect_devserial(__maybe_unused detectone_func_t detectone, __maybe_unused const char*prodname)
 {
 #ifndef WIN32
 	DIR *D;

+ 1 - 1
miner.h

@@ -426,7 +426,7 @@ struct cgpu_info {
 #ifdef USE_SCRYPT
 	int opt_lg, lookup_gap;
 	size_t opt_tc, thread_concurrency;
-	int shaders;
+	size_t shaders;
 #endif
 	struct timeval tv_gpustart;;
 	struct timeval tv_gpuend;