From ea524d7befeb743c5316cb472f9180536ced5862 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 22 Sep 2014 10:42:20 +0900 Subject: Adhoc fix compile error of usb_usb --- protocol/usb_hid/arduino-1.0.1/cores/arduino/WString.h | 2 +- protocol/usb_hid/override_wiring.c | 1 + protocol/usb_hid/parser.cpp | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'protocol/usb_hid') 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 @@ // -std=c++0x class __FlashStringHelper; -#define F(string_literal) (reinterpret_cast<__FlashStringHelper *>(PSTR(string_literal))) +#define F(string_literal) (reinterpret_cast(PSTR(string_literal))) // An inherited class for holding the result of a concatenation. These // 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 @@ /* * To keep Timer0 for common/timer.c override arduino/wiring.c. */ +#define __DELAY_BACKWARD_COMPATIBLE__ #include #include "common/timer.h" #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 @@ -#include - #include "parser.h" #include "usb_hid.h" -- cgit v1.2.3-24-g4f1b