diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-17 12:19:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-10-17 12:19:53 +0000 |
| commit | cc2b8264bf8c01e2f8df8aaba808ba4af0687359 (patch) | |
| tree | 551dca33e8a69e983f317946282917f2d6f2910d /ACE/ace/OS_NS_stdio.inl | |
| parent | a3f2779f267ea6604b410a56d90fc3fb5e31054f (diff) | |
| download | ATCD-cc2b8264bf8c01e2f8df8aaba808ba4af0687359.tar.gz | |
Fri Oct 17 12:14:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/OS_NS_stdio.inl')
| -rw-r--r-- | ACE/ace/OS_NS_stdio.inl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 87d74dcb543..5a90c98aca4 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -511,15 +511,11 @@ ACE_OS::fdopen (ACE_HANDLE handle, const ACE_TCHAR *mode) if (crt_handle != -1) { -# if defined(ACE_HAS_NONCONST_FDOPEN) && !defined (ACE_USES_WCHAR) - file = ::_fdopen (crt_handle, const_cast<ACE_TCHAR *> (mode)); -# elif defined (ACE_HAS_NONCONST_FDOPEN) && defined (ACE_USES_WCHAR) - file = ::_wfdopen (crt_handle, const_cast<ACE_TCHAR *> (mode)); -# elif defined (ACE_USES_WCHAR) +# if defined (ACE_USES_WCHAR) file = ::_wfdopen (crt_handle, mode); # else file = ::_fdopen (crt_handle, mode); -# endif /* ACE_HAS_NONCONST_FDOPEN */ +# endif /* ACE_USES_WCHAR */ if (!file) { @@ -910,7 +906,7 @@ ACE_OS::tempnam (const wchar_t *dir, const wchar_t *pfx) ACE_OSCALL_RETURN (::_wtempnam (const_cast <wchar_t*> (dir), const_cast <wchar_t*> (pfx)), wchar_t *, 0); # else ACE_OSCALL_RETURN (::_wtempnam (dir, pfx), wchar_t *, 0); -# endif /* __BORLANDC__ */ +# endif /* ACE_HAS_NONCONST_TEMPNAM */ #else /* ACE_LACKS_TEMPNAM */ // No native wide-char support; convert to narrow and call the char* variant. char *ndir = ACE_Wide_To_Ascii (dir).char_rep (); |