diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2015-03-12 16:18:55 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2015-03-12 16:18:55 +0100 |
| commit | e0c3b8a45217811be7f23ff2b1f8b397a9c5489e (patch) | |
| tree | e964c13888efde15fc19f8d7bd5b9f9039e6a65c /lib | |
| parent | e025b97c1a8a65ca6e86a35aeb84e07cef34522a (diff) | |
| parent | 44e68be13b8541bc88c4dede2df1b8ab08ba651e (diff) | |
| download | Nim-e0c3b8a45217811be7f23ff2b1f8b397a9c5489e.tar.gz | |
Merge pull request #2321 from def-/times-js
Fix some compiler warnings in times
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/times.nim | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/pure/times.nim b/lib/pure/times.nim index c39667611..149bb21df 100644 --- a/lib/pure/times.nim +++ b/lib/pure/times.nim @@ -26,9 +26,10 @@ type WeekDay* = enum ## represents a weekday dMon, dTue, dWed, dThu, dFri, dSat, dSun -var - timezone {.importc, header: "<time.h>".}: int - tzname {.importc, header: "<time.h>" .}: array[0..1, cstring] +when not defined(JS): + var + timezone {.importc, header: "<time.h>".}: int + tzname {.importc, header: "<time.h>" .}: array[0..1, cstring] when defined(posix) and not defined(JS): type @@ -482,7 +483,7 @@ elif defined(JS): return newDate() const - weekDays: array [0..6, TWeekDay] = [ + weekDays: array [0..6, WeekDay] = [ dSun, dMon, dTue, dWed, dThu, dFri, dSat] proc getLocalTime(t: Time): TimeInfo = @@ -490,7 +491,7 @@ elif defined(JS): result.minute = t.getMinutes() result.hour = t.getHours() result.monthday = t.getDate() - result.month = TMonth(t.getMonth()) + result.month = Month(t.getMonth()) result.year = t.getFullYear() result.weekday = weekDays[t.getDay()] result.yearday = 0 @@ -500,7 +501,7 @@ elif defined(JS): result.minute = t.getUTCMinutes() result.hour = t.getUTCHours() result.monthday = t.getUTCDate() - result.month = TMonth(t.getUTCMonth()) + result.month = Month(t.getUTCMonth()) result.year = t.getUTCFullYear() result.weekday = weekDays[t.getUTCDay()] result.yearday = 0 @@ -554,7 +555,7 @@ proc `$`*(day: WeekDay): string = return lookup[day] proc `$`*(m: Month): string = - ## stingify operator for ``TMonth``. + ## stingify operator for ``Month``. const lookup: array[Month, string] = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"] @@ -1104,4 +1105,4 @@ when isMainModule: # Kitchen = "3:04PM" s = "3:04PM" f = "h:mmtt" - echo "Kitchen: " & $s.parse(f) \ No newline at end of file + echo "Kitchen: " & $s.parse(f) |