summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Gjenero <dreamlayers@rockbox.org>2011-12-15 21:49:48 +0000
committerBoris Gjenero <dreamlayers@rockbox.org>2011-12-15 21:49:48 +0000
commit8414a44ad428eaac2b81295cb454160f26671b05 (patch)
tree7211e111848d8511c7bd09f140a5567fda65582e
parente38baa0fae3ef347e4061d90d5a6790af5d8d959 (diff)
downloadrockbox-8414a44ad428eaac2b81295cb454160f26671b05.tar.gz
rockbox-8414a44ad428eaac2b81295cb454160f26671b05.zip
Remove conditional added around set_day_of_week in r31301.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31305 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/common/timefuncs.c2
-rw-r--r--firmware/include/timefuncs.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/firmware/common/timefuncs.c b/firmware/common/timefuncs.c
index cffdb3951a..af4b596dd0 100644
--- a/firmware/common/timefuncs.c
+++ b/firmware/common/timefuncs.c
@@ -105,7 +105,6 @@ int set_time(const struct tm *tm)
105#endif /* RTC */ 105#endif /* RTC */
106} 106}
107 107
108#if CONFIG_RTC
109void set_day_of_week(struct tm *tm) 108void set_day_of_week(struct tm *tm)
110{ 109{
111 int y=tm->tm_year+1900; 110 int y=tm->tm_year+1900;
@@ -116,5 +115,4 @@ void set_day_of_week(struct tm *tm)
116 if(m == 0 || m == 1) y--; 115 if(m == 0 || m == 1) y--;
117 tm->tm_wday = (d + mo[m] + y + y/4 - y/100 + y/400) % 7; 116 tm->tm_wday = (d + mo[m] + y + y/4 - y/100 + y/400) % 7;
118} 117}
119#endif /* CONFIG_RTC */
120 118
diff --git a/firmware/include/timefuncs.h b/firmware/include/timefuncs.h
index 4c5f0fbb42..b7e9be53c6 100644
--- a/firmware/include/timefuncs.h
+++ b/firmware/include/timefuncs.h
@@ -30,8 +30,8 @@ struct tm *get_time(void);
30int set_time(const struct tm *tm); 30int set_time(const struct tm *tm);
31#if CONFIG_RTC 31#if CONFIG_RTC
32bool valid_time(const struct tm *tm); 32bool valid_time(const struct tm *tm);
33void set_day_of_week(struct tm *tm);
34#endif 33#endif
34void set_day_of_week(struct tm *tm);
35 35
36#endif /* _TIMEFUNCS_H_ */ 36#endif /* _TIMEFUNCS_H_ */
37 37