Remove libusb/libusbx specific code because libraries are now the same

again
This commit is contained in:
Klaus Reimer 2013-07-13 21:39:48 +02:00
parent 78a11c8c2e
commit 40460f34ec

View File

@ -172,11 +172,7 @@ JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getPortNumber)
NOT_NULL(env, device, return 0);
libusb_device *dev = unwrapDevice(env, device);
if (!dev) return 0;
#if defined(LIBUSBX_API_VERSION)
return libusb_get_port_number(dev);
#else
return 0;
#endif
return libusb_get_port_number(dev);
}
/**
@ -193,11 +189,7 @@ JNIEXPORT jint JNICALL METHOD_NAME(LibUsb, getPortNumbers)
if (!dev) return 0;
jsize size = (*env)->GetArrayLength(env, path);
unsigned char buffer[size];
#if defined(LIBUSBX_API_VERSION)
int result = libusb_get_port_numbers(dev, buffer, size);
#else
int result = 0;
#endif
int result = libusb_get_port_numbers(dev, buffer, size);
if (result > 0) (*env)->SetByteArrayRegion(env, path, 0, result, (jbyte *) buffer);
return result;
}