diff options
Diffstat (limited to 'ace/OS_NS_stdlib.h')
| -rw-r--r-- | ace/OS_NS_stdlib.h | 58 |
1 files changed, 21 insertions, 37 deletions
diff --git a/ace/OS_NS_stdlib.h b/ace/OS_NS_stdlib.h index 85b4f468e49..161f39ed902 100644 --- a/ace/OS_NS_stdlib.h +++ b/ace/OS_NS_stdlib.h @@ -97,13 +97,13 @@ namespace ACE_OS { size_t size, ACE_COMPARE_FUNC); - extern ACE_Export + extern ACE_Export void *calloc (size_t elements, size_t sizeof_elements); - extern ACE_Export + extern ACE_Export void exit (int status = 0); - extern ACE_Export + extern ACE_Export void free (void *); ACE_NAMESPACE_INLINE_FUNCTION @@ -115,7 +115,7 @@ namespace ACE_OS { # endif /* ACE_HAS_WCHAR && ACE_WIN32 */ // not in spec - extern ACE_Export + extern ACE_Export ACE_TCHAR *getenvstrings (void); // itoa not in spec @@ -131,41 +131,32 @@ namespace ACE_OS { #if !defined (ACE_HAS_ITOA) /// Emulated itoa - Converts an integer to a string. - extern ACE_Export + extern ACE_Export char *itoa_emulation (int value, char *string, int radix); #endif /* !ACE_HAS_ITOA */ #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_ITOW) /// Emulated itow - Converts an integer to a string. - extern ACE_Export + extern ACE_Export wchar_t *itow_emulation (int value, wchar_t *string, int radix); #endif /* ACE_HAS_WCHAR && ACE_LACKS_ITOW */ - extern ACE_Export + extern ACE_Export void *malloc (size_t); #if !defined (ACE_LACKS_MKSTEMP) ACE_NAMESPACE_INLINE_FUNCTION - ACE_HANDLE mkstemp (char *t); - -# if defined (ACE_HAS_WCHAR) - ACE_NAMESPACE_INLINE_FUNCTION - ACE_HANDLE mkstemp (wchar_t *t); -# endif /* ACE_HAS_WCHAR */ +#else + extern ACE_Export #endif /* !ACE_LACKS_MKSTEMP */ + ACE_HANDLE mkstemp (ACE_TCHAR *t); #if !defined (ACE_LACKS_MKTEMP) ACE_NAMESPACE_INLINE_FUNCTION - char *mktemp (char *t); - -# if defined (ACE_HAS_WCHAR) - ACE_NAMESPACE_INLINE_FUNCTION - wchar_t *mktemp (wchar_t *t); -# endif /* ACE_HAS_WCHAR */ #else - extern ACE_Export - ACE_TCHAR *mktemp (ACE_TCHAR *t); + extern ACE_Export #endif /* !ACE_LACKS_MSTEMP */ + ACE_TCHAR *mktemp (ACE_TCHAR *t); ACE_NAMESPACE_INLINE_FUNCTION int putenv (const char *string); @@ -191,23 +182,16 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int rand_r (ACE_RANDR_TYPE &seed); - extern ACE_Export + extern ACE_Export void *realloc (void *, size_t); -#if !defined (ACE_HAS_WINCE) -# if !defined (ACE_LACKS_REALPATH) - ACE_NAMESPACE_INLINE_FUNCTION -# else - extern ACE_Export -# endif /* !ACE_LACKS_REALPATH */ - char *realpath (const char *file_name, char *resolved_name); - -# if defined (ACE_HAS_WCHAR) +#if !defined (ACE_LACKS_REALPATH) ACE_NAMESPACE_INLINE_FUNCTION - wchar_t *realpath (const wchar_t *file_name, wchar_t *resolved_name); -# endif /* ACE_HAS_WCHAR */ -#endif /* ACE_HAS_WINCE */ - +#else + extern ACE_Export +#endif /* !ACE_LACKS_REALPATH */ + ACE_TCHAR *realpath (const ACE_TCHAR *file_name, ACE_TCHAR *resolved_name); + // exit_hook and set_exit_hook not in spec /// Function that is called by <ACE_OS::exit>, if non-null. extern ACE_Export ACE_EXIT_HOOK exit_hook_; @@ -246,7 +230,7 @@ namespace ACE_OS { #endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOL */ #if defined (ACE_LACKS_STRTOL) - extern ACE_Export + extern ACE_Export long strtol_emulation (const char *nptr, char **endptr, int base); #endif /* ACE_LACKS_STRTOL */ @@ -261,7 +245,7 @@ namespace ACE_OS { #endif /* ACE_HAS_WCHAR && !ACE_LACKS_WCSTOUL */ #if defined (ACE_LACKS_STRTOUL) - extern ACE_Export + extern ACE_Export unsigned long strtoul_emulation (const char *nptr, char **endptr, int base); |