summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2006-09-22 05:30:26 +0000
committereb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>2006-09-22 05:30:26 +0000
commitbd91aeab420858beb3fabc60570bb147027ac6a4 (patch)
treefac106ccc221c62eddb2bcfa7b43c0a8df6a4e8c
parent9a3c01437bf8952a401345919b8c9b32e1a10bf0 (diff)
applied supplied patch to close ticket:70
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3608 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--usrp/host/lib/usrp_prims.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/usrp/host/lib/usrp_prims.cc b/usrp/host/lib/usrp_prims.cc
index ea6f7ba7af..2fd594fa09 100644
--- a/usrp/host/lib/usrp_prims.cc
+++ b/usrp/host/lib/usrp_prims.cc
@@ -244,12 +244,13 @@ usrp_open_interface (struct usb_device *dev, int interface, int altinterface)
abort ();
}
-#if defined(WIN32)
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
// There's no get get_configuration function, and with some of the newer kernels
// setting the configuration, even if to the same value, hoses any other processes
// that have it open. Hence we opt to not set it at all (We've only
// got a single configuration anyway). This may hose the win32 stuff...
+ // Appears to be required for libusb-win32 and Cygwin -- dew 09/20/06
if (usb_set_configuration (udh, 1) < 0){
/*
* Ignore this error.