From 1978e82e4e531b641868432727ed70b4838fc12c Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Wed, 20 Nov 2013 16:55:22 +0100 Subject: Use PGM_P instead of prog_char On later versions of avr-libc, prog_char is deprecated. In 0acebeeff48 the one occurence of prog_char was replaced by "char PROGMEM", which is not entirely correct (PROGMEM is supposed to be an attribute on a variable, not on a type, even though this is how things work in older libc versions). However, in 1130fede3a2 a few new occurences of prog_char are introduced, which break compilation on newer libc versions again. This commit changes all these pointer types to use the PGM_P macro from . This macro is just "const char *" in newer libc versions and "const prog_char *" in older versions, so it should always work. References #795 --- cores/arduino/Print.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cores/arduino/Print.cpp') diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp index 9a6b964..86cac38 100644 --- a/cores/arduino/Print.cpp +++ b/cores/arduino/Print.cpp @@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size) size_t Print::print(const __FlashStringHelper *ifsh) { - const char PROGMEM *p = (const char PROGMEM *)ifsh; + PGM_P p = (PGM_P)ifsh; size_t n = 0; while (1) { unsigned char c = pgm_read_byte(p++); -- cgit v1.2.3-18-g5258