Sfoglia il codice sorgente

Change 'localtime_r' to 'localtime' for compatibility on IAR.

armink 8 anni fa
parent
commit
29445b6590
1 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4 4
      ntp/ntp.c

+ 4 - 4
ntp/ntp.c

@@ -236,14 +236,14 @@ time_t ntp_get_local_time(void)
  */
  */
 time_t ntp_sync_to_rtc(void)
 time_t ntp_sync_to_rtc(void)
 {
 {
-    struct tm cur_tm;
+    struct tm *cur_tm;
     time_t cur_time = ntp_get_local_time();
     time_t cur_time = ntp_get_local_time();
 
 
     if (cur_time)
     if (cur_time)
     {
     {
-        localtime_r(&cur_time, &cur_tm);
-        set_time(cur_tm.tm_hour, cur_tm.tm_min, cur_tm.tm_sec);
-        set_date(cur_tm.tm_year + 1900, cur_tm.tm_mon + 1, cur_tm.tm_mday);
+        cur_tm = localtime(&cur_time);
+        set_time(cur_tm->tm_hour, cur_tm->tm_min, cur_tm->tm_sec);
+        set_date(cur_tm->tm_year + 1900, cur_tm->tm_mon + 1, cur_tm->tm_mday);
     }
     }
 
 
     return cur_time;
     return cur_time;