diff options
| -rw-r--r-- | avr-libc-1.7.1/include/avr/pgmspace.h | 2 | ||||
| -rw-r--r-- | avr-libc-1.7.1/libc/stdlib/dtostre.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/avr-libc-1.7.1/include/avr/pgmspace.h b/avr-libc-1.7.1/include/avr/pgmspace.h index 2e4a1df..d81647f 100644 --- a/avr-libc-1.7.1/include/avr/pgmspace.h +++ b/avr-libc-1.7.1/include/avr/pgmspace.h @@ -252,7 +252,7 @@ typedef uint64_t prog_uint64_t PROGMEM; # define PSTR(s) ((const PROGMEM char *)(s)) #else /* !DOXYGEN */ /* The real thing. */ -# define PSTR(s) (__extension__({static char __c[] PROGMEM = (s); &__c[0];})) +# define PSTR(s) (__extension__({static const char __c[] PROGMEM = (s); &__c[0];})) #endif /* DOXYGEN */ #define __LPM_classic__(addr) \ diff --git a/avr-libc-1.7.1/libc/stdlib/dtostre.c b/avr-libc-1.7.1/libc/stdlib/dtostre.c index 3e6d3b0..c171369 100644 --- a/avr-libc-1.7.1/libc/stdlib/dtostre.c +++ b/avr-libc-1.7.1/libc/stdlib/dtostre.c @@ -37,12 +37,12 @@ ATTRIBUTE_CLIB_SECTION char * dtostre (double val, char *sbeg, unsigned char prec, unsigned char flags) { - __attribute__((progmem)) static char str_nan[2][4] = + __attribute__((progmem)) static const char str_nan[2][4] = {"nan", "NAN"}; - __attribute__((progmem)) static char str_inf[2][sizeof(str_nan[0])] = + __attribute__((progmem)) static const char str_inf[2][sizeof(str_nan[0])] = {"inf", "INF"}; char *d; /* dst */ - char *s; /* src */ + const char *s; /* src */ signed char exp; unsigned char vtype; |