diff options
| author | Steve Huston <shuston@riverace.com> | 2008-08-04 20:01:17 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2008-08-04 20:01:17 +0000 |
| commit | e8c5ac52fef8ff9cfc4004d5de0d9a7befed3d50 (patch) | |
| tree | 741fba9f8bf7d683abce353c4a42459c79c640fc /ACE/ace/Process.cpp | |
| parent | d2b8ba2cce0860372d1d76bdc2ae4d1e114fb465 (diff) | |
| download | ATCD-e8c5ac52fef8ff9cfc4004d5de0d9a7befed3d50.tar.gz | |
ChangeLogTag:Mon Aug 4 19:58:20 UTC 2008 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/Process.cpp')
| -rw-r--r-- | ACE/ace/Process.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index 51671ff70bd..0640892ee4f 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -856,7 +856,7 @@ ACE_Process_Options::inherit_environment (void) // Get the existing environment. ACE_TCHAR *existing_environment = 0; -#ifndef ACE_USES_WCHAR +#if defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) WCHAR *existing_wide_env = 0; ACE_Vector<char> temp_narrow_env; if (this->use_unicode_environment_) @@ -897,7 +897,7 @@ ACE_Process_Options::inherit_environment (void) slot += len + 1; } -#ifndef ACE_USES_WCHAR +#if defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) if (this->use_unicode_environment_) ::FreeEnvironmentStringsW (existing_wide_env); else |