diff options
| author | tmk <nobody@nowhere> | 2014-09-22 10:42:20 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-09-22 10:42:20 +0900 |
| commit | ea524d7befeb743c5316cb472f9180536ced5862 (patch) | |
| tree | 1be232413b52bcac278d25be074c5394f069c283 /protocol/usb_hid | |
| parent | b9e265368fde73daff069788dcb58c8230d01b32 (diff) | |
| download | qmk_firmware-ea524d7befeb743c5316cb472f9180536ced5862.tar.gz qmk_firmware-ea524d7befeb743c5316cb472f9180536ced5862.zip | |
Adhoc fix compile error of usb_usb
Diffstat (limited to 'protocol/usb_hid')
| -rw-r--r-- | protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h | 2 | ||||
| -rw-r--r-- | protocol/usb_hid/override_wiring.c | 1 | ||||
| -rw-r--r-- | protocol/usb_hid/parser.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h b/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h index d76d2a33d..947325e5f 100644 --- a/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h +++ b/protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | // -std=c++0x | 35 | // -std=c++0x |
| 36 | 36 | ||
| 37 | class __FlashStringHelper; | 37 | class __FlashStringHelper; |
| 38 | #define F(string_literal) (reinterpret_cast<__FlashStringHelper *>(PSTR(string_literal))) | 38 | #define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal))) |
| 39 | 39 | ||
| 40 | // An inherited class for holding the result of a concatenation. These | 40 | // An inherited class for holding the result of a concatenation. These |
| 41 | // result objects are assumed to be writable by subsequent concatenations. | 41 | // result objects are assumed to be writable by subsequent concatenations. |
diff --git a/protocol/usb_hid/override_wiring.c b/protocol/usb_hid/override_wiring.c index 3b3f5e302..1e9a94ce2 100644 --- a/protocol/usb_hid/override_wiring.c +++ b/protocol/usb_hid/override_wiring.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * To keep Timer0 for common/timer.c override arduino/wiring.c. | 2 | * To keep Timer0 for common/timer.c override arduino/wiring.c. |
| 3 | */ | 3 | */ |
| 4 | #define __DELAY_BACKWARD_COMPATIBLE__ | ||
| 4 | #include <util/delay.h> | 5 | #include <util/delay.h> |
| 5 | #include "common/timer.h" | 6 | #include "common/timer.h" |
| 6 | #include "Arduino.h" | 7 | #include "Arduino.h" |
diff --git a/protocol/usb_hid/parser.cpp b/protocol/usb_hid/parser.cpp index 66e949518..28151f9d5 100644 --- a/protocol/usb_hid/parser.cpp +++ b/protocol/usb_hid/parser.cpp | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | #include <cstring.h> | ||
| 2 | |||
| 3 | #include "parser.h" | 1 | #include "parser.h" |
| 4 | #include "usb_hid.h" | 2 | #include "usb_hid.h" |
| 5 | 3 | ||
