From a50fd0ecb5917085c1501637a565fd953ae26655 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sun, 16 Jun 2013 18:07:47 +0200 Subject: [PATCH] Also make timeout read a long. --- src/main/c/src/Transfer.c | 6 +++--- src/main/java/de/ailis/usb4java/libusb/Transfer.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/c/src/Transfer.c b/src/main/c/src/Transfer.c index 45861b4..74edbb4 100644 --- a/src/main/c/src/Transfer.c +++ b/src/main/c/src/Transfer.c @@ -161,9 +161,9 @@ JNIEXPORT void JNICALL METHOD_NAME(Transfer, setTimeout) } /** - * int timeout() + * long timeout() */ -JNIEXPORT jint JNICALL METHOD_NAME(Transfer, timeout) +JNIEXPORT jlong JNICALL METHOD_NAME(Transfer, timeout) ( JNIEnv *env, jobject this ) @@ -171,7 +171,7 @@ JNIEXPORT jint JNICALL METHOD_NAME(Transfer, timeout) struct libusb_transfer *transfer = unwrapTransfer(env, this); if (!transfer) return 0; - return (jint) transfer->timeout; + return transfer->timeout; } /** diff --git a/src/main/java/de/ailis/usb4java/libusb/Transfer.java b/src/main/java/de/ailis/usb4java/libusb/Transfer.java index 7f990d7..b6c250f 100644 --- a/src/main/java/de/ailis/usb4java/libusb/Transfer.java +++ b/src/main/java/de/ailis/usb4java/libusb/Transfer.java @@ -120,7 +120,7 @@ public final class Transfer * * @return The timeout. */ - public native int timeout(); + public native long timeout(); /** * Sets the timeout for this transfer in milliseconds. A value of 0