diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-09 14:06:54 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-09 14:06:54 +0100 |
| commit | 3212c450bbb16199e02c3470fccf593727c567e7 (patch) | |
| tree | c315e83117eb63477fd1fffb7867fdab8a4928ac /dbus/dbus-sysdeps.c | |
| parent | bf7c65f5218d07734bcc7be373ebc33278806824 (diff) | |
| parent | 79aafc193176253454dd455a4cfc45a1a2e36c00 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
Diffstat (limited to 'dbus/dbus-sysdeps.c')
| -rw-r--r-- | dbus/dbus-sysdeps.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index c76603a8..1a736e42 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -185,7 +185,19 @@ _dbus_getenv (const char *varname) dbus_bool_t _dbus_clearenv (void) { - return (clearenv () == 0); + dbus_bool_t rc = TRUE; + +#ifdef HAVE_CLEARENV + if (clearenv () != 0) + rc = FALSE; +#else + extern char **environ; + + if (environ != NULL) + environ[0] = NULL; +#endif + + return rc; } /* |