jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further fixes (stupid kdiff automerge)

Browse source
This commit is contained in:
Clay Sweetser 2013-12-18 16:04:43 -05:00
commit 9de92522a6
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/os.nim
View file

@ -970,7 +970,7 @@ proc moveFile*(source, dest: string) {.rtl, extern: "nos$1",
if crename(source, dest) != 0'i32:
raise newException(EOS, $strerror(errno))
when not defined(ENOENT):
when not defined(ENOENT) and not defined(Windows):
var ENOENT {.importc, header: "<errno.h>".}: cint
when defined(Windows):
@ -987,8 +987,7 @@ proc removeFile*(file: string) {.rtl, extern: "nos$1", tags: [FWriteDir].} =
## Removes the `file`. If this fails, `EOS` is raised. This does not fail
## if the file never existed in the first place.
## On Windows, ignores the read-only attribute.
if cremove(file) != 0'i32 and errno != ENOENT:
when defined(Windows):
when defined(Windows):
when useWinUnicode:
let f = newWideCString(file)
else: