diff options
| author | Flaviu Tamas <tamasflaviu@gmail.com> | 2015-05-26 19:32:50 -0400 |
|---|---|---|
| committer | Flaviu Tamas <tamasflaviu@gmail.com> | 2015-06-07 13:12:18 -0400 |
| commit | 90ed34db72e8ea8f70d1e86dd2335efe48532fa8 (patch) | |
| tree | 9d9e46c0ddbb87f562981f072220bd36a7f199cb /lib/pure/encodings.nim | |
| parent | 075a5e844069979f1fc3782839e9e2cc62c61ad5 (diff) | |
| parent | bbb1bdb4a939aa43ed981acc2f96bce918be7d21 (diff) | |
| download | Nim-90ed34db72e8ea8f70d1e86dd2335efe48532fa8.tar.gz | |
Merge branch 'devel' of https://github.com/Araq/Nim into add-nre
* 'devel' of https://github.com/Araq/Nim: Fix #964, fix #1384 Don't inspect typedescs
Diffstat (limited to 'lib/pure/encodings.nim')
| -rw-r--r-- | lib/pure/encodings.nim | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pure/encodings.nim b/lib/pure/encodings.nim index 2a6134615..e427b585d 100644 --- a/lib/pure/encodings.nim +++ b/lib/pure/encodings.nim @@ -211,12 +211,13 @@ when defined(windows): when false: # not needed yet: type - TCpInfo = object + CpInfo = object maxCharSize: int32 defaultChar: array[0..1, char] leadByte: array[0..12-1, char] + {.deprecated: [TCpInfo: CpInfo].} - proc getCPInfo(codePage: CodePage, lpCPInfo: var TCpInfo): int32 {. + proc getCPInfo(codePage: CodePage, lpCPInfo: var CpInfo): int32 {. stdcall, importc: "GetCPInfo", dynlib: "kernel32".} proc nameToCodePage(name: string): CodePage = @@ -262,7 +263,7 @@ else: else: const iconvDll = "(libc.so.6|libiconv.so)" - when defined(macosx) and defined(powerpc): + when defined(macosx): const prefix = "lib" else: const prefix = "" |