[Pcsclite-cvs-commit] r4907 - /trunk/Drivers/ccid/src/ccid_usb.h

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sat May  1 10:40:50 2010
New Revision: 4907

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4907
Log:
Do not try to be smart and always #include <usb.h>

Should fix FreeBSD issues

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

Modified: trunk/Drivers/ccid/src/ccid_usb.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_usb.h?rev=4907&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.h (original)
+++ trunk/Drivers/ccid/src/ccid_usb.h Sat May  1 10:40:50 2010
@@ -35,10 +35,9 @@
 
 status_t CloseUSB(unsigned int reader_index);
 
-#if defined (__USB_H__) || defined (_SYS_USB_LIBUSB_USB_H)
+#include <usb.h>
 /*@null@*/ struct usb_interface *get_ccid_usb_interface(
 	struct usb_device *dev, int *num);
-#endif
 
 int ControlUSB(int reader_index, int requesttype, int request, int value,
 	unsigned char *bytes, unsigned int size);