diff options
author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/OS_NS_stdlib.cpp | |
parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/OS_NS_stdlib.cpp')
-rw-r--r-- | ACE/ace/OS_NS_stdlib.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp index ad6ed536954..1bef126ab39 100644 --- a/ACE/ace/OS_NS_stdlib.cpp +++ b/ACE/ace/OS_NS_stdlib.cpp @@ -37,13 +37,7 @@ ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0; void * ACE_OS::calloc (size_t elements, size_t sizeof_elements) { -#if !defined (ACE_HAS_WINCE) return ACE_CALLOC_FUNC (elements, sizeof_elements); -#else - // @@ This will probably not work since it doesn't consider - // alignment properly. - return ACE_MALLOC_FUNC (elements * sizeof_elements); -#endif /* ACE_HAS_WINCE */ } void @@ -51,13 +45,13 @@ ACE_OS::exit (int status) { ACE_OS_TRACE ("ACE_OS::exit"); -#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) +#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER) // Shut down the ACE_Object_Manager, if it had registered its exit_hook. // With ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is // instantiated on the main's stack. ::exit () doesn't destroy it. if (exit_hook_) (*exit_hook_) (); -#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ +#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ #if defined (ACE_WIN32) ::ExitProcess ((UINT) status); @@ -90,9 +84,7 @@ ACE_OS::free (void *ptr) ACE_TCHAR * ACE_OS::getenvstrings () { -#if defined (ACE_LACKS_GETENVSTRINGS) - ACE_NOTSUP_RETURN (0); -#elif defined (ACE_WIN32) +#if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) return ::GetEnvironmentStringsW (); # else /* ACE_USES_WCHAR */ @@ -110,13 +102,6 @@ ACE_OS::getenvstrings () ACE_TCHAR * ACE_OS::strenvdup (const ACE_TCHAR *str) { -#if defined (ACE_HAS_WINCE) - // WinCE doesn't have environment variables so we just skip it. - return ACE_OS::strdup (str); -#elif defined (ACE_LACKS_STRENVDUP) - ACE_UNUSED_ARG (str); - ACE_NOTSUP_RETURN (0); -#else const ACE_TCHAR * start = 0; if ((start = ACE_OS::strchr (str, ACE_TEXT ('$'))) != 0) { @@ -170,7 +155,6 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) } else return ACE_OS::strdup (str); -#endif /* ACE_HAS_WINCE */ } #if !defined (ACE_HAS_ITOA) |