diff options
| author | Steve Huston <shuston@riverace.com> | 2014-10-10 21:58:31 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2014-10-10 21:58:31 +0000 |
| commit | ad906bbed19a4e2e35a3adb429de6cb678217aec (patch) | |
| tree | dc3bbf6d52c1dd3b1f89607aec46d33c94e7b2a6 /ACE/ace/OS_NS_stdlib.inl | |
| parent | 8cb211430ac1af0f738444209565ca9aa2840a62 (diff) | |
| download | ATCD-ad906bbed19a4e2e35a3adb429de6cb678217aec.tar.gz | |
ChangeLogTag:Thu Oct 9 16:21:38 UTC 2014 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/OS_NS_stdlib.inl')
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.inl | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index a0e33f4236d..91b39046ea8 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -272,24 +272,26 @@ ACE_OS::mkstemp (wchar_t *s) } #endif /* ACE_HAS_WCHAR */ -#if !defined (ACE_LACKS_MKTEMP) +#if !defined (ACE_DISABLE_MKTEMP) + +# if !defined (ACE_LACKS_MKTEMP) ACE_INLINE char * ACE_OS::mktemp (char *s) { -# if defined (ACE_WIN32) +# if defined (ACE_WIN32) return ::_mktemp (s); -# else /* ACE_WIN32 */ +# else /* ACE_WIN32 */ return ::mktemp (s); -# endif /* ACE_WIN32 */ +# endif /* ACE_WIN32 */ } -# if defined (ACE_HAS_WCHAR) +# if defined (ACE_HAS_WCHAR) ACE_INLINE wchar_t * ACE_OS::mktemp (wchar_t *s) { -# if defined (ACE_WIN32) +# if defined (ACE_WIN32) return ::_wmktemp (s); -# else +# else // For narrow-char filesystems, we must convert the wide-char input to // a narrow-char string for mktemp (), then convert the name back to // wide-char for the caller. @@ -299,11 +301,12 @@ ACE_OS::mktemp (wchar_t *s) ACE_Ascii_To_Wide wide_s (narrow_s.char_rep ()); ACE_OS::strcpy (s, wide_s.wchar_rep ()); return s; -# endif +# endif } # endif /* ACE_HAS_WCHAR */ -#endif /* !ACE_LACKS_MKTEMP */ +# endif /* !ACE_LACKS_MKTEMP */ +#endif /* !ACE_DISABLE_MKTEMP */ ACE_INLINE int ACE_OS::putenv (const char *string) |