diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2009-03-19 12:45:08 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2009-03-19 12:45:08 +0000 |
| commit | 205c51d7258344a9e9482b3c537f61896c0a5b87 (patch) | |
| tree | 0e57528c753f2a4564cd72470e09cc4270dafb16 | |
| parent | 06335b6417754d7ceb096a6153ccc47ae3d17971 (diff) | |
| download | ATCD-205c51d7258344a9e9482b3c537f61896c0a5b87.tar.gz | |
Thu Mar 19 12:42:07 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* ace/OS_NS_unistd.inl:
Further clean up to maintain style consistency in new dup()
impl.
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.inl | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 241bd5ec000..a485a8c2a44 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,9 +1,16 @@ +Thu Mar 19 12:42:07 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/OS_NS_unistd.inl: + + Further clean up to maintain style consistency in new dup() + impl. + Thu Mar 19 11:57:46 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> * ace/OS_NS_unistd.inl: Clean up compile errors. - + Wed Mar 18 14:48:23 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/OS_NS_unistd.{h,inl}: Added a new ACE_OS::dup() method with diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 49072dd2eed..a2d64d7b179 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -220,7 +220,11 @@ ACE_INLINE ACE_HANDLE ACE_OS::dup(ACE_HANDLE handle, int pid) { ACE_OS_TRACE("ACE_OS::dup"); -#if defined (ACE_WIN32) && !defined(ACE_HAS_WINCE) +#if defined (ACE_LACKS_DUP) || defined (ACE_HAS_WINCE) + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (pid); + ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); +#elif defined (ACE_WIN32) ACE_HANDLE new_fd; ACE_HANDLE hTargetProcess = ::OpenProcess (PROCESS_DUP_HANDLE, FALSE, @@ -239,13 +243,8 @@ ACE_OS::dup(ACE_HANDLE handle, int pid) else ACE_FAIL_RETURN (ACE_INVALID_HANDLE); /*NOTREACHED*/ -#elif defined(ACE_LACKS_DUP) - ACE_UNUSED_ARGS(handle); - ACE_NOTSUP_RETURN(-1); -#elif defined(ACE_HAS_WINCE) - ACE_UNUSED_ARG(handle) - ACE_NOTSUP_RETURN(0); -#else +#else + ACE_UNUSED_ARG (pid); ACE_OSCALL_RETURN(::dup(handle), ACE_HANDLE, ACE_INVALID_HANDLE); #endif /*ACE_WIN32 && !ACE_HAS_WINCE*/ } |