diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-10-31 13:40:36 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-10-31 13:40:36 +0000 |
| commit | 62c0c01e71b91d04d894d0cbc366a8c18f7c4d43 (patch) | |
| tree | 83b6afe9849270a652e42c716f11c1167994d571 /ACE | |
| parent | 80d69f67fbd34d486c520fde3c068253572bb5bf (diff) | |
| download | ATCD-62c0c01e71b91d04d894d0cbc366a8c18f7c4d43.tar.gz | |
ChangeLogTag: Wed Oct 31 13:38:39 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.cpp | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 7d274cf707a..d05ae3c5195 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Oct 31 13:38:39 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/OS_NS_unistd.cpp: + + Add ACE_UNUSED_ARG for ACE_HAS_THREADS case. + Wed Oct 31 12:17:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_vxworks6.2.GNU: diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index 2c7b21c233f..112f49e6253 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -212,8 +212,7 @@ ACE_OS::fork (const ACE_TCHAR *program_name) ::fork (); #endif /* ACE_HAS_STHREADS */ -#if !defined (ACE_HAS_MINIMAL_ACE_OS) -#if !defined (ACE_HAS_THREADS) +#if !defined (ACE_HAS_MINIMAL_ACE_OS) && !defined (ACE_HAS_THREADS) // ACE_Base_Thread_Adapter::sync_log_msg() is used to update the // program name and process id in ACE's log framework. However, we @@ -226,11 +225,15 @@ ACE_OS::fork (const ACE_TCHAR *program_name) // process will undoubtedly call async signal unsafe functions too. // So it doesn't really matter that the program name and process id // will not be updated. - + if (pid == 0) ACE_Base_Thread_Adapter::sync_log_msg (program_name); -#endif /* ! ACE_HAS_THREADS */ -#endif /* ! ACE_HAS_MINIMAL_ACE_OS */ + +#else + + ACE_UNUSED_ARG (program_name); + +#endif /* ! ACE_HAS_MINIMAL_ACE_OS && !ACE_HAS_THREADS */ return pid; # endif /* ACE_WIN32 */ |