Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader
This commit is contained in:
commit
66019a7550
|
@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size)
|
||||||
|
|
||||||
size_t Print::print(const __FlashStringHelper *ifsh)
|
size_t Print::print(const __FlashStringHelper *ifsh)
|
||||||
{
|
{
|
||||||
const prog_char *p = (const prog_char *)ifsh;
|
const char PROGMEM *p = (const char PROGMEM *)ifsh;
|
||||||
size_t n = 0;
|
size_t n = 0;
|
||||||
while (1) {
|
while (1) {
|
||||||
unsigned char c = pgm_read_byte(p++);
|
unsigned char c = pgm_read_byte(p++);
|
||||||
|
|
Loading…
Reference in New Issue