Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 3500109)
libusb: Fix build issues under cygwin/mingw
authorSpencer Oliver <spen@spen-soft.co.uk>
Mon, 28 Nov 2011 14:56:13 +0000 (14:56 +0000)
committerSpencer Oliver <spen@spen-soft.co.uk>
Fri, 2 Dec 2011 12:26:33 +0000 (12:26 +0000)
This fixes issues with the folliwing patch under cygwin/mingw builds.
http://openocd.zylin.com/236

Change-Id: I7dd0b2d09cc64568bc99b16aa32e791a8273c5db
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/240
Tested-by: jenkins
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
Reviewed-by: Mauro Gamba <maurillo71@gmail.com>
src/jtag/drivers/libusb0_common.h patch | blob | history
src/jtag/drivers/libusb1_common.h patch | blob | history

diff --git a/src/jtag/drivers/libusb0_common.h b/src/jtag/drivers/libusb0_common.h
index 9cf235e37933812e5db63b1c57bcdbfa715d5162..985d084333ef6ff4196abcd40894bfdc1ef99170 100644 (file)
--- a/src/jtag/drivers/libusb0_common.h
+++ b/src/jtag/drivers/libusb0_common.h
@@ -36,7 +36,7 @@
 #define jtag_libusb_reset_device(dev)          usb_reset(dev)
 #define jtag_libusb_get_device(devh)           usb_device(devh)
 
-inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
+static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
                                       int iface)
 {
        return usb_claim_interface(devh, iface);
diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb1_common.h
index 89e8c1ec5a67b418975f1bb9866b8c4385490ecf..2cff3f09a9ba99f9b5d80b3921edbcb1814e2a6c 100644 (file)
--- a/src/jtag/drivers/libusb1_common.h
+++ b/src/jtag/drivers/libusb1_common.h
@@ -36,7 +36,7 @@
 #define jtag_libusb_reset_device(dev)          libusb_reset_device(dev)
 #define jtag_libusb_get_device(devh)           libusb_get_device(devh)
 
-inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
+static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
                                       int iface)
 {
        return libusb_claim_interface(devh, iface);
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)