diff options
| author | A. S. Budden <abudden@gmail.com> | 2016-06-13 16:44:14 +0100 |
|---|---|---|
| committer | A. S. Budden <abudden@gmail.com> | 2016-06-13 16:44:14 +0100 |
| commit | 1095b35a79abfd8c59db8dc92e8aab5951bc4093 (patch) | |
| tree | 81eec1c4b2720412edae261de1ceade628877b04 /lib/system/widestrs.nim | |
| parent | 5327cd0a84df0ad6c29bf534003ba7c97e9bcb73 (diff) | |
| parent | 58bb12d5ce431fce70a22fa69b80bf021e2d1ce6 (diff) | |
| download | Nim-1095b35a79abfd8c59db8dc92e8aab5951bc4093.tar.gz | |
Merged upstream/devel into this branch to resolve conflicts and ensure an easy merge back into upstream/devel
Diffstat (limited to 'lib/system/widestrs.nim')
| -rw-r--r-- | lib/system/widestrs.nim | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/system/widestrs.nim b/lib/system/widestrs.nim index 5a30a7c0f..6ad0cfd58 100644 --- a/lib/system/widestrs.nim +++ b/lib/system/widestrs.nim @@ -104,12 +104,7 @@ proc newWideCString*(source: cstring, L: int): WideCString = proc newWideCString*(s: cstring): WideCString = if s.isNil: return nil - when not declared(c_strlen): - proc c_strlen(a: cstring): int {. - header: "<string.h>", noSideEffect, importc: "strlen".} - - let L = c_strlen(s) - result = newWideCString(s, L) + result = newWideCString(s, s.len) proc newWideCString*(s: string): WideCString = result = newWideCString(s, s.len) |