Even more fixes from rebase issues with libusbemu.

qdot · qdot · commit de14baf2bc02 · 2010-12-25T18:57:26.000-08:00
Signed-off-by: Kyle Machulis &lt;kyle@nonpolynomial.com&gt;
diff --git a/platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp b/platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp
@@ -369,6 +369,7 @@ static QuickEvent hAbort;
 
 int libusb_handle_events(libusb_context* ctx)
 {
+  int ret = 0;
   ctx->mutex.Enter();
   ctx->processing.Signal();
 
@@ -428,7 +429,7 @@ int libusb_handle_events(libusb_context* ctx)
   ctx->mutex.Leave();
 
   // 0 on success, or a LIBUSB_ERROR code on failure
-  return(0);
+  return(ret);
 }
 
 enum EReapResult { ETIMEOUT = -116, ECANCELLED = -998 };

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ static QuickEvent hAbort;`
`369`	`369`
`370`	`370`	`int libusb_handle_events(libusb_context* ctx)`
`371`	`371`	`{`
	`372`	`+ int ret = 0;`
`372`	`373`	`ctx->mutex.Enter();`
`373`	`374`	`ctx->processing.Signal();`
`374`	`375`
`@@ -428,7 +429,7 @@ int libusb_handle_events(libusb_context* ctx)`
`428`	`429`	`ctx->mutex.Leave();`
`429`	`430`
`430`	`431`	`// 0 on success, or a LIBUSB_ERROR code on failure`
`431`		`- return(0);`
	`432`	`+ return(ret);`
`432`	`433`	`}`
`433`	`434`
`434`	`435`	`enum EReapResult { ETIMEOUT = -116, ECANCELLED = -998 };`