summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2009-03-19 11:57:58 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2009-03-19 11:57:58 +0000
commit06335b6417754d7ceb096a6153ccc47ae3d17971 (patch)
tree5857cb3c87266a9f34d8d3e708e59be463a748ba
parent589adfe0ea501c97b0aad6acd77fd7b0fc59f2c6 (diff)
downloadATCD-06335b6417754d7ceb096a6153ccc47ae3d17971.tar.gz
Thu Mar 19 11:57:46 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* ace/OS_NS_unistd.inl: Clean up compile errors.
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/OS_NS_unistd.inl6
2 files changed, 9 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c64f2f0c540..241bd5ec000 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+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 a5584f0b9a3..49072dd2eed 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -217,11 +217,11 @@ ACE_OS::dup (ACE_HANDLE handle)
}
ACE_INLINE ACE_HANDLE
-ACE_OS:dup(ACE_HANDLE handle, int pid)
+ACE_OS::dup(ACE_HANDLE handle, int pid)
{
ACE_OS_TRACE("ACE_OS::dup");
-#define(ACE_WIN32)&&!defined(ACE_HAS_WINCE)
- ACE_HADLE new_fd;
+#if defined (ACE_WIN32) && !defined(ACE_HAS_WINCE)
+ ACE_HANDLE new_fd;
ACE_HANDLE hTargetProcess = ::OpenProcess (PROCESS_DUP_HANDLE,
FALSE,
pid);