Browse Source

Remove unused HAVE_LISBUSB macro and use USE_USBUTILS everywhere.

ckolivas 12 years ago
parent
commit
0f42fd3f46
2 changed files with 3 additions and 5 deletions
  1. 2 4
      cgminer.c
  2. 1 1
      miner.h

+ 2 - 4
cgminer.c

@@ -6862,7 +6862,7 @@ static void clean_up(void)
 #ifdef HAVE_OPENCL
 	clear_adl(nDevs);
 #endif
-#ifdef HAVE_LIBUSB
+#ifdef USE_USBUTILS
         libusb_exit(NULL);
 #endif
 
@@ -7483,18 +7483,16 @@ int main(int argc, char *argv[])
 		initial_args[i] = strdup(argv[i]);
 	initial_args[argc] = NULL;
 
-#ifdef HAVE_LIBUSB
+#ifdef USE_USBUTILS
 	int err = libusb_init(NULL);
 	if (err) {
 		fprintf(stderr, "libusb_init() failed err %d", err);
 		fflush(stderr);
 		quit(1, "libusb_init() failed");
 	}
-#ifdef USE_USBUTILS
 	mutex_init(&cgusb_lock);
 	mutex_init(&cgusbres_lock);
 	cglock_init(&cgusb_fd_lock);
-#endif
 #endif
 
 	mutex_init(&hash_lock);

+ 1 - 1
miner.h

@@ -117,7 +117,7 @@ static inline int fsync (int fd)
  #include "ADL_SDK/adl_sdk.h"
 #endif
 
-#ifdef HAVE_LIBUSB
+#ifdef USE_USBUTILS
   #include <libusb.h>
 #endif