diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-20 08:07:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-20 08:07:01 +0000 |
| commit | 8e17dd0ae6a7c154aee3928c913dfd2faa193b0f (patch) | |
| tree | 4d0feb470a4989bae3aa61c909aa6935edb62cfd | |
| parent | e2a7d0cbb27e9fa09e768aafb5d114e4cde851d6 (diff) | |
| download | ATCD-8e17dd0ae6a7c154aee3928c913dfd2faa193b0f.tar.gz | |
Fri Mar 20 08:07:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_unistd.{h,inl}:
Use correct type for pid and WinCE change
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.h | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.inl | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index cbc8d197416..e62e7cfb005 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 20 08:07:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_unistd.{h,inl}: + Use correct type for pid and WinCE change + Thu Mar 19 16:07:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/config/acedefaults.mpb: diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index aaa36f2d827..dc718d3a40a 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -99,7 +99,7 @@ namespace ACE_OS ACE_HANDLE dup (ACE_HANDLE handle); ACE_NAMESPACE_INLINE_FUNCTION - ACE_HANDLE dup (ACE_HANDLE handle, int pid); + ACE_HANDLE dup (ACE_HANDLE handle, pid_t pid); ACE_NAMESPACE_INLINE_FUNCTION int dup2 (ACE_HANDLE oldfd, diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index a2d64d7b179..9682c3e7cd6 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -217,10 +217,10 @@ ACE_OS::dup (ACE_HANDLE handle) } ACE_INLINE ACE_HANDLE -ACE_OS::dup(ACE_HANDLE handle, int pid) +ACE_OS::dup(ACE_HANDLE handle, pid_t pid) { ACE_OS_TRACE("ACE_OS::dup"); -#if defined (ACE_LACKS_DUP) || defined (ACE_HAS_WINCE) +#if defined (ACE_LACKS_DUP) ACE_UNUSED_ARG (handle); ACE_UNUSED_ARG (pid); ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); @@ -243,7 +243,7 @@ ACE_OS::dup(ACE_HANDLE handle, int pid) else ACE_FAIL_RETURN (ACE_INVALID_HANDLE); /*NOTREACHED*/ -#else +#else ACE_UNUSED_ARG (pid); ACE_OSCALL_RETURN(::dup(handle), ACE_HANDLE, ACE_INVALID_HANDLE); #endif /*ACE_WIN32 && !ACE_HAS_WINCE*/ |