summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2009-04-10 03:33:03 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2009-04-10 03:33:03 +0000
commitb4c4a91d0ee2c082ef765a60c4ea42ca4f5b04a5 (patch)
tree49eac302d9bd4392ce61e18cf7a3a3d720e0efd3
parent549343bfe9502c4feba65f0baf629a54598bd050 (diff)
downloadATCD-b4c4a91d0ee2c082ef765a60c4ea42ca4f5b04a5.tar.gz
Fri Apr 10 03:32:04 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* ace/OS_NS_stdlib.inl: Fix typo from previous commit.
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/ace/OS_NS_stdlib.inl5
2 files changed, 10 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index affd5f383c6..da8a5dfad12 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 10 03:32:04 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * ace/OS_NS_stdlib.inl:
+
+ Fix typo from previous commit.
+
Fri Apr 10 03:00:44 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* ace/OS_NS_stdlib.inl:
@@ -7,7 +13,7 @@ Fri Apr 10 03:00:44 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
because that platform defines unsetenv as having a void
return. It is possible that other platforms have this as well,
as legacy linux man pages show that signature.
-
+
Thu Apr 9 12:34:41 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ace/OS_NS_stdio.inl:
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl
index 78d92517c26..bddd77a48f5 100644
--- a/ACE/ace/OS_NS_stdlib.inl
+++ b/ACE/ace/OS_NS_stdlib.inl
@@ -364,9 +364,10 @@ ACE_OS::unsetenv(const char *name)
# if defined (ACE_HAS_VOID_UNSETENV)
::unsetenv (name);
return 0;
-# endif /* ACE_HAS_VOID_UNSETENV */
+#else
ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::unsetenv (name), int, -1);
-#endif
+# endif /* ACE_HAS_VOID_UNSETENV */
+#endif /* ACE_LACKS_UNSETENV */
}
#if defined (ACE_HAS_WCHAR) && defined (ACE_WIN32)