diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-24 16:19:48 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-01-24 16:19:48 +0000 |
| commit | 349d86359be2cce625f9f881670c4bc9adbc3ce3 (patch) | |
| tree | 0677ce496dde98b9cfd49e2297a1815288fce6fe /ace/OS_NS_stdio.inl | |
| parent | b383e130421f41363aabff845dead77ea315e155 (diff) | |
| download | ATCD-349d86359be2cce625f9f881670c4bc9adbc3ce3.tar.gz | |
ChangeLogTag: Sat Jan 24 16:06:11 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/OS_NS_stdio.inl')
| -rw-r--r-- | ace/OS_NS_stdio.inl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl index c21ac140387..f2adf882f84 100644 --- a/ace/OS_NS_stdio.inl +++ b/ace/OS_NS_stdio.inl @@ -903,14 +903,14 @@ ACE_OS::tempnam (const ACE_TCHAR *dir, const ACE_TCHAR *pfx) // pSOS only considers the directory prefix ACE_UNUSED_ARG (pfx); ACE_OSCALL_RETURN (::tmpnam ((char *) dir), char *, 0); -#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && !defined(ACE_USES_WCHAR)) || defined (__IBMCPP__))) +#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && !defined(ACE_USES_WCHAR) && (__BORLANDC__ < 0x600)) || defined (__IBMCPP__))) ACE_OSCALL_RETURN (::_tempnam ((char *) dir, (char *) pfx), char *, 0); -#elif defined(ACE_WIN32) && defined (__BORLANDC__) && defined (ACE_USES_WCHAR) +#elif defined(ACE_WIN32) && (defined (__BORLANDC__) && (__BORLANDC__ < 0x600)) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wtempnam ((wchar_t*) dir, (wchar_t*) pfx), wchar_t *, 0); #elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0); #else /* ACE_HAS_WINCE || ACE_LACKS_TEMPNAM */ - ACE_OSCALL_RETURN (::tempnam (dir, pfx), char *, 0); + ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::tempnam (dir, pfx), char *, 0); #endif /* VXWORKS */ } @@ -925,7 +925,11 @@ ACE_INLINE int ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) { # if defined (ACE_HAS_VSWPRINTF) +# if defined (ACE_HAS_DINKUM_STL) + return ACE_STD_NAMESPACE::vswprintf (buffer, ULONG_MAX, format, argptr); +#else return ::vswprintf (buffer, format, argptr); +# endif /* ACE_HAS_DINKUM_STL */ # else ACE_UNUSED_ARG (buffer); |