diff options
| author | alaviss <alaviss@users.noreply.github.com> | 2020-03-27 08:08:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 09:08:13 +0100 |
| commit | 0eaacbc2c45376383a6704c76687d05e62e8f772 (patch) | |
| tree | 270d7f672a3a681171955ee10e37fb9d77b49fe2 /lib/pure/includes | |
| parent | 142c59fc378f11301023c2940e08feeea3448696 (diff) | |
| download | Nim-0eaacbc2c45376383a6704c76687d05e62e8f772.tar.gz | |
More fixes for Haiku (#13774)
* osproc: move fork-based code path under the when conditional * osproc: avoid using the environ global on Haiku * osenv: import environ from stdlib.h on Haiku Haiku's environ is declared in `<stdlib.h>` by default, differing from POSIX and/or Linux. Import it from there to avoid collision with anyone importing `<stdlib.h>` from Nim.
Diffstat (limited to 'lib/pure/includes')
| -rw-r--r-- | lib/pure/includes/osenv.nim | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pure/includes/osenv.nim b/lib/pure/includes/osenv.nim index c4c6669f9..e06c4bc49 100644 --- a/lib/pure/includes/osenv.nim +++ b/lib/pure/includes/osenv.nim @@ -81,6 +81,8 @@ else: # at runtime. proc NSGetEnviron(): ptr cstringArray {. importc: "_NSGetEnviron", header: "<crt_externs.h>".} + elif defined(haiku): + var gEnv {.importc: "environ", header: "<stdlib.h>".}: cstringArray else: var gEnv {.importc: "environ".}: cstringArray |