From 5ee89b73d0c371a152cb4d6ba5d169b7d6bd53c4 Mon Sep 17 00:00:00 2001 From: schmidt Date: Fri, 9 Nov 2001 23:00:26 +0000 Subject: ChangeLogTag:Fri Nov 9 07:42:41 2001 Douglas C. Schmidt --- ace/OS.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ace/OS.cpp') diff --git a/ace/OS.cpp b/ace/OS.cpp index 75ce714dfd2..e536619de75 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -1008,13 +1008,15 @@ ACE_OS::fopen (const ACE_TCHAR *filename, int fd = _open_osfhandle ((long) handle, hmode); if (fd != -1) { -# if defined(__BORLANDC__) +# if defined (__BORLANDC__) && !defined (ACE_USES_WCHAR)) FILE *fp = ::_fdopen (fd, ACE_const_cast (char *, mode)); +# elif (defined (__BORLANDC__) && defined (ACE_USES_WCHAR)) + FILE *fp = ::_wfdopen (fd, ACE_const_cast (wchar_t *, mode)); # elif defined (ACE_USES_WCHAR) FILE *fp = ::_wfdopen (fd, mode); # else FILE *fp = ::fdopen (fd, mode); -# endif /* defined(__BORLANDC__) */ +# endif /* defined(__BORLANDC__) && !defined (ACE_USES_WCHAR)) */ if (fp != NULL) return fp; _close (fd); -- cgit v1.2.1