[Pcsclite-cvs-commit] r5827 - /trunk/Drivers/ccid/src/ccid_usb.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jul  5 21:07:50 2011
New Revision: 5827

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5827
Log:
OpenUSBByName(): readerID is also needed on Mac OS X 

Partly reverting revision r5816

Modified:
    trunk/Drivers/ccid/src/ccid_usb.c

Modified: trunk/Drivers/ccid/src/ccid_usb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_usb.c?rev=5827&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Tue Jul  5 21:07:50 2011
@@ -321,9 +321,11 @@
 				int interface;
 				int num = 0;
 				const unsigned char *device_descriptor;
+#if defined(USE_COMPOSITE_AS_MULTISLOT) || defined(__APPLE__)
+				int readerID = (vendorID << 16) + productID;
+#endif
 
 #ifdef USE_COMPOSITE_AS_MULTISLOT
-				int readerID = (vendorID << 16) + productID;
 				static int static_interface = 1;
 
 				/* simulate a composite device as when libudev is used */