make code compatible with up-to-date build environment

These changes make it possible to compile open9x with old (avr-gcc 4.3.3, 
avr-libc 1.6.7) and up-to-date (avr-gcc 4.6.2, avr-libc 1.8.0) build
environments. See Issue 1 for more details.
This commit is contained in:
mihlit@mihlit.cz
2012-02-02 11:23:38 +00:00
parent 973b91cd3f
commit acd523e699
21 changed files with 418 additions and 400 deletions
+4 -4
View File
@@ -69,7 +69,7 @@ void menuProcTemplates(uint8_t event);
#endif
void menuProcExpoOne(uint8_t event);
MenuFuncP_PROGMEM APM menuTabModel[] = {
const MenuFuncP_PROGMEM menuTabModel[] PROGMEM = {
menuProcModelSelect,
menuProcModel,
#ifdef HELI
@@ -91,8 +91,8 @@ MenuFuncP_PROGMEM APM menuTabModel[] = {
#endif
};
const prog_char * s_warning = 0;
const prog_char * s_warning_info;
const pm_char * s_warning = 0;
const pm_char * s_warning_info;
uint8_t s_warning_info_len;
// uint8_t s_warning_info_att not needed now
uint8_t s_confirmation = 0;
@@ -105,7 +105,7 @@ void displayBox()
// could be a place for a s_warning_info
}
void displayPopup(const prog_char * pstr)
void displayPopup(const pm_char * pstr)
{
s_warning = pstr;
displayBox();