diff options
| author | Steve Huston <shuston@riverace.com> | 2008-07-01 22:49:26 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2008-07-01 22:49:26 +0000 |
| commit | b580380cb3f7bef2c9d4708e2ca24293cedab53d (patch) | |
| tree | a1718f4a9c07a21d05b15104dacee1fb97fc2421 /ACE/ace/Process.cpp | |
| parent | 78d01b8dd16db1e3242b39cbb40b70b028e512df (diff) | |
| download | ATCD-b580380cb3f7bef2c9d4708e2ca24293cedab53d.tar.gz | |
ChangeLogTag:Tue Jul 1 22:47:17 UTC 2008 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/Process.cpp')
| -rw-r--r-- | ACE/ace/Process.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index 67006690bc4..fe9ee80dbc0 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -160,7 +160,7 @@ ACE_Process::spawn (ACE_Process_Options &options) #elif defined (ACE_WIN32) void* env_buf = options.env_buf (); DWORD flags = options.creation_flags (); -# if !defined (ACE_USES_WCHAR) +# if defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) wchar_t* wenv_buf = 0; if (options.use_unicode_environment ()) { @@ -182,7 +182,7 @@ ACE_Process::spawn (ACE_Process_Options &options) options.startup_info (), &this->process_info_); -# if !defined (ACE_USES_WCHAR) +# if defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) if (options.use_unicode_environment ()) delete wenv_buf; # endif @@ -730,7 +730,9 @@ ACE_Process::close_passed_handles (void) return; } -#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && \ + defined (ACE_HAS_WCHAR) && !defined (ACE_USES_WCHAR) && \ + !defined (ACE_HAS_WINCE) wchar_t* ACE_Process::convert_env_buffer (const char* env) const { |