diff options
author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/tests/Process_Manager_Test.cpp | |
parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/tests/Process_Manager_Test.cpp')
-rw-r--r-- | ACE/tests/Process_Manager_Test.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 7464ffded68..241498941b9 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -75,9 +75,7 @@ spawn_child (const ACE_TCHAR *argv0, int sleep_time, int my_process_id) { -#if defined (ACE_HAS_WINCE) -const ACE_TCHAR *cmdline_format = ACE_TEXT("%s %d"); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) const ACE_TCHAR *cmdline_format = ACE_TEXT("\"%s\" %s %d"); #elif !defined (ACE_USES_WCHAR) const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT("%s %s %d"); @@ -134,9 +132,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE opts.process_name (argv0); #ifndef ACE_LACKS_VA_FUNCTIONS opts.command_line (cmdline_format, -#if !defined (ACE_HAS_WINCE) argv0, -#endif /* !ACE_HAS_WINCE */ cmd, sleep_time); #else @@ -570,8 +566,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } #endif /* ACE_HAS_THREADS */ -#if !defined (ACE_OPENVMS) && \ - (defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS) +#if defined ACE_WIN32 || !defined ACE_LACKS_UNIX_SIGNALS // -------------------------------------------------- // Finally, try the reactor stuff... mgr.open (ACE_Process_Manager::DEFAULT_SIZE, @@ -601,7 +596,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P) %d processes left in manager\n"), nr_procs)); -#endif /* !defined (ACE_OPENVMS) */ +#endif /* defined (ACE_WIN32) */ #endif // ACE_HAS_PROCESS_SPAWN ACE_END_TEST; return test_status; |