Skip to content

Commit

Permalink
Revert export of times.CTime; add std/time_t instead. (#10319)
Browse files Browse the repository at this point in the history
* Revert export of times.CTime
* Add std/time_t
  • Loading branch information
GULPF authored and Araq committed Jan 16, 2019
1 parent fc30cf0 commit 5df411b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 7 deletions.
11 changes: 4 additions & 7 deletions lib/pure/times.nim
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ when defined(JS):
elif defined(posix):
import posix

type CTime* = posix.Time
type CTime = posix.Time

var
realTimeClockId {.importc: "CLOCK_REALTIME", header: "<time.h>".}: Clockid
Expand All @@ -233,13 +233,10 @@ elif defined(posix):
tzset()

elif defined(windows):
import winlean
import winlean, std/time_t

type CTime = time_t.Time

when defined(i386) and defined(gcc):
type CTime* {.importc: "time_t", header: "<time.h>".} = distinct int32
else:
# newest version of Visual C++ defines time_t to be of 64 bits
type CTime* {.importc: "time_t", header: "<time.h>".} = distinct int64
# visual c's c runtime exposes these under a different name
var timezone {.importc: "_timezone", header: "<time.h>".}: int

Expand Down
23 changes: 23 additions & 0 deletions lib/std/time_t.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#
#
# Nim's Runtime Library
# (c) Copyright 2019 Nim contributors
#
# See the file "copying.txt", included in this
# distribution, for details about the copyright.
#

when defined(nimdoc):
type
impl = distinct int64
Time* = impl ## \
## Wrapper for ``time_t``. On posix, this is an alias to ``posix.Time``.
elif defined(windows):
when defined(i386) and defined(gcc):
type Time* {.importc: "time_t", header: "<time.h>".} = distinct int32
else:
# newest version of Visual C++ defines time_t to be of 64 bits
type Time* {.importc: "time_t", header: "<time.h>".} = distinct int64
elif defined(posix):
import posix
export posix.Time
1 change: 1 addition & 0 deletions tools/kochdocs.nim
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ lib/pure/collections/heapqueue.nim
lib/pure/fenv.nim
lib/std/sha1.nim
lib/std/varints.nim
lib/std/time_t.nim
lib/impure/rdstdin.nim
lib/wrappers/linenoise/linenoise.nim
lib/pure/strformat.nim
Expand Down

0 comments on commit 5df411b

Please sign in to comment.