File gnupg-2.0.13-ccid-driver-fix.diff of Package gpg2

File gnupg-2.0.13-ccid-driver-fix.diff of Package gpg2 (Revision 36894b01c76f78cc4b3e84f82cd52467)

Currently displaying revision 36894b01c76f78cc4b3e84f82cd52467, show latest

--- scd/ccid-driver.c.orig	2009-07-30 11:21:13.000000000 +0200
+++ scd/ccid-driver.c	2009-11-27 22:05:08.000000000 +0100
@@ -74,8 +74,6 @@
 # include <config.h>
 #endif
 
-#if defined(HAVE_LIBUSB) || defined(TEST)
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -94,7 +92,14 @@
 #include "ccid-driver.h"
 
 #define DRVNAME "ccid-driver: "
-
+static int debug_level;     /* Flag to control the debug output. 
+                               0 = No debugging
+                               1 = USB I/O info
+                               2 = T=1 protocol tracing
+                              */
+ 
+#if defined(HAVE_LIBUSB) || defined(TEST)
+#include <usb.h>
 
 /* Depending on how this source is used we either define our error
    output to go to stderr or to the jnlib based logging functions.  We
@@ -270,13 +275,6 @@
 
 
 static int initialized_usb; /* Tracks whether USB has been initialized. */
-static int debug_level;     /* Flag to control the debug output. 
-                               0 = No debugging
-                               1 = USB I/O info
-                               2 = Level 1 + T=1 protocol tracing
-                               3 = Level 2 + USB/I/O tracing of SlotStatus.
-                              */
-
 
 static unsigned int compute_edc (const unsigned char *data, size_t datalen,
                                  int use_crc);