summaryrefslogtreecommitdiff
path: root/ace/OS.cpp
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-11-09 23:00:26 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-11-09 23:00:26 +0000
commit5ee89b73d0c371a152cb4d6ba5d169b7d6bd53c4 (patch)
tree3034ef53615811a7dfe86669e14a145d4305430c /ace/OS.cpp
parent2c76a46e5e7ec37c37a590f2b67b67b6cdd30ad2 (diff)
downloadATCD-5ee89b73d0c371a152cb4d6ba5d169b7d6bd53c4.tar.gz
ChangeLogTag:Fri Nov 9 07:42:41 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
Diffstat (limited to 'ace/OS.cpp')
-rw-r--r--ace/OS.cpp6
1 files changed, 4 insertions, 2 deletions
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);