diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-08-30 05:50:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2002-08-30 05:50:47 +0000 |
| commit | 3ec2a830010373345a4c7d175cba32f96f122c43 (patch) | |
| tree | 46272eec718f85e5485c4d5acb585a722b7d8a48 /ace/OS.i | |
| parent | 52249b869d298daaa7058f91964b7359704e9963 (diff) | |
| download | ATCD-3ec2a830010373345a4c7d175cba32f96f122c43.tar.gz | |
ChangeLogTag: Fru Aug 30 05:47:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/OS.i')
| -rw-r--r-- | ace/OS.i | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -834,9 +834,9 @@ 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 (__BORLANDC__) && !defined(ACE_USES_WCHAR)) || (defined (ACE_WIN32) && defined (__IBMCPP__)) +#elif (defined (ACE_WIN32) && ((defined (__BORLANDC__) && !defined(ACE_USES_WCHAR)) || defined (__IBMCPP__))) ACE_OSCALL_RETURN (::_tempnam ((char *) dir, (char *) pfx), char *, 0); -#elif defined (__BORLANDC__) && defined (ACE_USES_WCHAR) +#elif defined(ACE_WIN32) && defined (__BORLANDC__) && 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); |