summaryrefslogtreecommitdiff
path: root/ACE/ace/Process.cpp
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2007-02-21 22:29:49 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2007-02-21 22:29:49 +0000
commitf11224da696a623a28510aafb10532ca999be51b (patch)
tree63afe56dbcdb765415669eeb73315cf45b03b9ca /ACE/ace/Process.cpp
parentcc970acff36ed652b93a32c8074558c310349658 (diff)
downloadATCD-f11224da696a623a28510aafb10532ca999be51b.tar.gz
ChangeLogTag:Wed Feb 21 19:27:14 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
Diffstat (limited to 'ACE/ace/Process.cpp')
-rw-r--r--ACE/ace/Process.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index b79fbcbd0f9..8bc756ceb22 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -112,15 +112,21 @@ ACE_Process::spawn (ACE_Process_Options &options)
h != ACE_INVALID_HANDLE && curr_len + 20 < max_len;
h = h_iter ())
{
-#if defined (ACE_WIN64)
+#if defined (ACE_WIN32)
+# if defined (ACE_WIN64)
curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
- ACE_LIB_TEXT (" +H %I64d"),
+ ACE_LIB_TEXT (" +H %I64p"),
h);
+# else
+ curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
+ ACE_LIB_TEXT (" +H %p"),
+ h);
+# endif /* ACE_WIN64 */
#else
curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len],
ACE_LIB_TEXT (" +H %d"),
h);
-#endif /* ACE_WIN64 */
+#endif /* ACE_WIN32 */
}
}
@@ -871,7 +877,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
do
{
retval = ACE_OS::vsnprintf (safe_stack_buf.get (), tmp_buflen, safe_newformat.get (), argp);
- if (retval > ACE_Utils::Truncate<int> (tmp_buflen))
+ if (retval > ACE_Utils::truncate_cast<int> (tmp_buflen))
{
tmp_buflen *= 2;
ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1);