diff options
| author | Caol?n McNamara <cmc@openoffice.org> | 2010-07-06 12:14:39 +0100 |
|---|---|---|
| committer | Caol?n McNamara <cmc@openoffice.org> | 2010-07-06 12:14:39 +0100 |
| commit | bee6b9eadce1fede1c812da815f49bbe9a6bc772 (patch) | |
| tree | 86ecf29db3566473453a4fafa9b9511ba5a3b213 /sal | |
| parent | 7add7926efaaeee7dd7913fd6df2b07a293c24f4 (diff) | |
cmcfixes76: #i112656# osl_clearEnvironment, MacOSX 10.4 has old-school void ret unsetenv
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/process_impl.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index fb7eb3d9220d..920122cbbfc5 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -407,6 +407,12 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString* pustrEnvVar) if (putenv(rtl_string_getStr(pBuffer)) == 0) result = osl_Process_E_None; +#elif (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD)) + //MacOSX baseline is 10.4, which has an old-school void return + //for unsetenv. + //See: http://developer.apple.com/mac/library/documentation/Darwin/Reference/ManPages/10.4/man3/unsetenv.3.html?useVersion=10.4 + unsetenv(rtl_string_getStr(pstr_env_var)); + result = osl_Process_E_None; #else if (unsetenv(rtl_string_getStr(pstr_env_var)) == 0) result = osl_Process_E_None; |