aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Progmem_AVR: prog_char typedef was deprecated in avr-gcc 4.7, add compat def

Browse Source
This commit is contained in:
Pat Hickey 2012-12-16 16:54:49 -08:00 committed by Andrew Tridgell
parent 3e3c0f57ae
commit 6ea38432b9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Progmem/AP_Progmem_AVR.h
View File

@ -16,8 +16,12 @@ typedef struct {
#define PROGMEM __attribute__(( section(".progmem.data") ))
#undef PSTR
/* need to define prog_char in avr-gcc 4.7 */
#if __AVR__ && __GNUC__ == 4 && __GNUC_MINOR__ > 6
typedef char prog_char;
#endif
/* Need const type for progmem - new for avr-gcc 4.6 */
#if __AVR__ && __GNUC__ == 4 && __GNUC_MINOR__ > 5
#if __AVR__ && __GNUC__ == 4 && __GNUC_MINOR__ > 5
#define PSTR(s) (__extension__({static const prog_char __c[] PROGMEM = (s); \
(const prog_char_t *)&__c[0]; }))
#else