From 64f81239874fc8045ca838cb1cbe20068d1a0d54 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Thu, 29 Dec 2011 20:57:39 +0000
Subject: [PATCH] gcc on MAC warnings

---
 src/model_menus.cpp | 12 +++++++-----
 src/pers.cpp        |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index c9c76c227..8ebb9af26 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -409,29 +409,31 @@ void menuProcModel(uint8_t event)
           (sub==subN && m_posHorz==2 ? ((s_editMode>0) ? BLINK : INVERS):0) );
       lcd_putsnAtt(19*FW, y, PSTR("\x7e\x7f")+1-timer->dir,1,sub==subN && m_posHorz==3 ? ((s_editMode>0) ? BLINK : INVERS) : 0);
       if (sub==subN && (s_editMode>0 || p1valdiff)) {
+        uint16_t timer_val = timer->val;
         switch (m_posHorz) {
          case 0:
            CHECK_INCDEC_MODELVAR(event, timer->mode, -(13+2*MAX_SWITCH),(13+2*MAX_SWITCH));
            break;
          case 1:
          {
-           int8_t min = timer->val/60;
+           int8_t min = timer_val/60;
            CHECK_INCDEC_MODELVAR(event, min, 0, 59);
-           timer->val = timer->val%60 + min*60;
+           timer_val = timer_val%60 + min*60;
            break;
          }
          case 2:
          {
-           int8_t sec = timer->val%60;
+           int8_t sec = timer_val%60;
            sec -= checkIncDecModel(event, sec+2, 1, 62)-2;
-           timer->val -= sec ;
-           if (((int16_t)timer->val) < 0) timer->val=0;
+           timer_val -= sec ;
+           if ((int16_t)timer_val < 0) timer_val=0;
            break;
          }
          case 3:
            CHECK_INCDEC_MODELVAR(event, timer->dir, 0, 1);
            break;
         }
+        timer->val = timer_val;
       }
       if ((y+=FH)>7*FH) return;
     } subN++;
diff --git a/src/pers.cpp b/src/pers.cpp
index d2794a748..7f1017060 100644
--- a/src/pers.cpp
+++ b/src/pers.cpp
@@ -283,7 +283,7 @@ void eeLoadModel(uint8_t id)
 
 #ifdef SIMU
     if (sz > 0 && sz != sizeof(g_model)) {
-      printf("Model data read=%d bytes vs %u bytes\n", sz, sizeof(ModelData));
+      printf("Model data read=%d bytes vs %lu bytes\n", sz, sizeof(ModelData));
     }
 #endif