diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-01-29 20:04:35 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-01-29 20:04:35 +0000 |
| commit | afe70cedf774436981defb900c5eb78d13ec13d0 (patch) | |
| tree | 4e93bf005247dba8f5406c25c0d49c49ada4e99b /libusb/descriptor.c | |
| parent | 47c83183c080c866c54bcf886e535ff7db907bb8 (diff) | |
| download | libusb-afe70cedf774436981defb900c5eb78d13ec13d0.tar.gz | |
r123: reverted the use of usb_interface in core and forced interface to be undefined always on Windows
Diffstat (limited to 'libusb/descriptor.c')
| -rw-r--r-- | libusb/descriptor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libusb/descriptor.c b/libusb/descriptor.c index 32cd795..6cbe23c 100644 --- a/libusb/descriptor.c +++ b/libusb/descriptor.c @@ -315,12 +315,12 @@ err: static void clear_configuration(struct libusb_config_descriptor *config) { - if (config->usb_interface) { + if (config->interface) { int i; for (i = 0; i < config->bNumInterfaces; i++) clear_interface((struct libusb_interface *) - config->usb_interface + i); - free((void *) config->usb_interface); + config->interface + i); + free((void *) config->interface); } if (config->extra) free((void *) config->extra); @@ -347,8 +347,8 @@ static int parse_configuration(struct libusb_context *ctx, tmp = config->bNumInterfaces * sizeof(struct libusb_interface); usb_interface = malloc(tmp); - config->usb_interface = usb_interface; - if (!config->usb_interface) + config->interface = usb_interface; + if (!config->interface) return LIBUSB_ERROR_NO_MEM; memset(usb_interface, 0, tmp); |