Skip to content

Commit a1e42c8

Browse files
Antonio Ospitezarvox
authored andcommitted
libusbemu: fix "expected unqualified-id before numeric constant" error
Undefine the error numeric constants before redefining them, some systems define those in errno.h which can be brought in by some other header. platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp: In function ‘int ReapTransfer(transfer_wrapper*, unsigned int, libusbemu::QuickList<transfer_wrapper>*)’: platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp:698: error: expected unqualified-id before numeric constant platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp:704: error: ‘ETIMEOUT’ was not declared in this scope platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp: At global scope: platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp:745: error: expected unqualified-id before ‘return’ platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp:746: error: expected declaration before ‘}’ token Signed-off-by: Antonio Ospite <[email protected]>
1 parent cbf9ef9 commit a1e42c8

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

platform/windows/libusb10emu/libusb-1.0/libusbemu.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,9 @@ int ReapTransfer(transfer_wrapper* wrapper, unsigned int timeout, libusb_device:
695695
// (a) the timeout passed to usb_reap_async_nocancel() expired;
696696
// (b) the transfer was cancelled via usb_cancel_async();
697697
// (c) some fatal error triggered.
698+
#undef EIO
699+
#undef EINVAL
700+
#undef ETIMEOUT
698701
enum EReapResult { EIO = -5, EINVAL = -22, ETIMEOUT = -116 };
699702
switch(read)
700703
{

0 commit comments

Comments
 (0)