summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2014-02-02 10:07:29 +0100
committerAraq <rumpf_a@web.de>2014-02-02 10:07:29 +0100
commit7196c7637e00581f94ca9c02782f34ef7d480e2f (patch)
treeff62ac4fd7d30b10daccd901a723af2fc4fe3a14
parent48888b9034017b28ba1cf8c432620e62ed784c0b (diff)
downloadNim-7196c7637e00581f94ca9c02782f34ef7d480e2f.tar.gz
bootstraps again
-rw-r--r--lib/pure/os.nim20
-rw-r--r--lib/windows/winlean.nim8
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index 4bdb0e7e7..245a8446b 100644
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -402,9 +402,9 @@ proc symlinkExists*(link: string): bool {.rtl, extern: "nos$1",
   ## regardless of whether the link points to a directory or file.
   when defined(windows):
     when useWinUnicode:
-      wrapUnary(a, GetFileAttributesW, link)
+      wrapUnary(a, getFileAttributesW, link)
     else:
-      var a = GetFileAttributesA(link)
+      var a = getFileAttributesA(link)
     if a != -1'i32:
       result = (a and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32
   else:
@@ -1378,14 +1378,14 @@ proc createSymlink*(src, dest: string) =
     when useWinUnicode:
       var wSrc = newWideCString(src)
       var wDst = newWideCString(dest)
-      if CreateSymbolicLinkW(wDst, wSrc, flag) == 0 or GetLastError() != 0:
-          osError(osLastError())
+      if createSymbolicLinkW(wDst, wSrc, flag) == 0 or getLastError() != 0:
+        osError(osLastError())
     else:
-      if CreateSymbolicLinkA(dest, src, flag) == 0 or GetLastError() != 0:
-          osError(osLastError())
+      if createSymbolicLinkA(dest, src, flag) == 0 or getLastError() != 0:
+        osError(osLastError())
   else:
     if symlink(src, dest) != 0:
-      OSError(OSLastError())
+      osError(osLastError())
 
 proc createHardlink*(src, dest: string) =
   ## Create a hard link at `dest` which points to the item specified
@@ -1398,13 +1398,13 @@ proc createHardlink*(src, dest: string) =
       var wSrc = newWideCString(src)
       var wDst = newWideCString(dest)
       if createHardLinkW(wDst, wSrc, nil) == 0:
-          OSError(OSLastError())
+        osError(osLastError())
     else:
       if createHardLinkA(dest, src, nil) == 0:
-          OSError(OSLastError())
+        osError(osLastError())
   else:
     if link(src, dest) != 0:
-      OSError(OSLastError())
+      osError(osLastError())
 
 proc parseCmdLine*(c: string): seq[string] {.
   noSideEffect, rtl, extern: "nos$1".} =
diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim
index 3aec2bd52..ee5fe0647 100644
--- a/lib/windows/winlean.nim
+++ b/lib/windows/winlean.nim
@@ -206,18 +206,18 @@ else:
     importc: "GetModuleFileNameA", dynlib: "kernel32", stdcall.}
 
 when useWinUnicode:
-  proc createSymbolicLinkW*(lpSymlinkFileName, lpTargetFileName: wideCString,
+  proc createSymbolicLinkW*(lpSymlinkFileName, lpTargetFileName: WideCString,
                          flags: DWORD): int32 {.
     importc:"CreateSymbolicLinkW", dynlib: "kernel32", stdcall.}
-  proc createHardLinkW*(lpFileName, lpExistingFileName: wideCString,
-                         security: Pointer=nil): int32 {.
+  proc createHardLinkW*(lpFileName, lpExistingFileName: WideCString,
+                         security: pointer=nil): int32 {.
     importc:"CreateHardLinkW", dynlib: "kernel32", stdcall.}
 else:
   proc createSymbolicLinkA*(lpSymlinkFileName, lpTargetFileName: cstring,
                            flags: DWORD): int32 {.
     importc:"CreateSymbolicLinkA", dynlib: "kernel32", stdcall.}
   proc createHardLinkA*(lpFileName, lpExistingFileName: cstring,
-                           security: Pointer=nil): int32 {.
+                           security: pointer=nil): int32 {.
     importc:"CreateHardLinkA", dynlib: "kernel32", stdcall.}
 
 const