diff options
| author | Tobias Koenig <tobias.koenig@kdab.com> | 2015-01-23 07:53:41 +0000 |
|---|---|---|
| committer | Tobias Koenig <tobias.koenig@kdab.com> | 2015-02-12 17:51:15 +0000 |
| commit | 7b9b54b1143f45bfd3beb55b8ef0737a97522774 (patch) | |
| tree | 8c3f66a434a29699555f02ec95f6c65614997db3 | |
| parent | be84381664f3c6459ae70dce4ae12f2ee9b39c8f (diff) | |
Haiku: Use setenv and unsetenv POSIX functions
The _POSIX_VERSION declared in Haiku is 199009L, so we have
to enable support for setenv/unsetenv explicitly until
Haiku POSIX version is updated.
Change-Id: Ic22374253b0512a6a816257db83b0c649be0585d
Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index cb42940825..06f9e9080e 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -3159,7 +3159,7 @@ bool qputenv(const char *varName, const QByteArray& value) { #if defined(_MSC_VER) && _MSC_VER >= 1400 return _putenv_s(varName, value.constData()) == 0; -#elif defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L +#elif (defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L) || defined(Q_OS_HAIKU) // POSIX.1-2001 has setenv return setenv(varName, value.constData(), true) == 0; #else @@ -3189,8 +3189,8 @@ bool qunsetenv(const char *varName) { #if defined(_MSC_VER) && _MSC_VER >= 1400 return _putenv_s(varName, "") == 0; -#elif (defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L) || defined(Q_OS_BSD4) - // POSIX.1-2001 and BSD have unsetenv +#elif (defined(_POSIX_VERSION) && (_POSIX_VERSION-0) >= 200112L) || defined(Q_OS_BSD4) || defined(Q_OS_HAIKU) + // POSIX.1-2001, BSD and Haiku have unsetenv return unsetenv(varName) == 0; #elif defined(Q_CC_MINGW) // On mingw, putenv("var=") removes "var" from the environment |