diff options
| author | Jing Yu <jingyu@google.com> | 2012-03-22 21:07:53 -0700 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-03-22 21:07:53 -0700 |
| commit | 9b9d708c6a8a66a75d9fdf8eb6b35305bb1712e3 (patch) | |
| tree | d34938b8628dc50afc2ad278a79a3f1480d84e80 | |
| parent | edcf5bc1c8da8cc4c8b560865d2a54b73c1b51d3 (diff) | |
| download | avr-libc-master.tar.gz | |
Change-Id: Ie1844caf74b222871c9ae01379e318972cc8f05e
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2239
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2241
| -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; |