summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-04-22 07:29:39 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-04-22 07:29:39 +0000
commit004639a9f48e2d1c5d1bdc6c87ddecc722fb4714 (patch)
tree2581b18299e49722c78d811f176df401f4ecabde /ace
parent3b76eab9f55d023a4efb2cedb5d6b0ca496700f7 (diff)
downloadATCD-004639a9f48e2d1c5d1bdc6c87ddecc722fb4714.tar.gz
ChangeLogTag: Tue Apr 22 07:28:23 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace')
-rw-r--r--ace/OS.i4
-rw-r--r--ace/config-vxworks5.x.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/ace/OS.i b/ace/OS.i
index 6c1ce286e30..6e867aefc76 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -831,7 +831,7 @@ ACE_INLINE ACE_TCHAR *
ACE_OS::tempnam (const ACE_TCHAR *dir, const ACE_TCHAR *pfx)
{
ACE_OS_TRACE ("ACE_OS::tempnam");
-#if defined (VXWORKS) || defined (ACE_HAS_WINCE) || defined (ACE_LACKS_TEMPNAM)
+#if defined (ACE_HAS_WINCE) || defined (ACE_LACKS_TEMPNAM)
ACE_UNUSED_ARG (dir);
ACE_UNUSED_ARG (pfx);
ACE_NOTSUP_RETURN (0);
@@ -845,7 +845,7 @@ ACE_OS::tempnam (const ACE_TCHAR *dir, const ACE_TCHAR *pfx)
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 /* VXWORKS */
+#else /* ACE_HAS_WINCE || ACE_LACKS_TEMPNAM */
ACE_OSCALL_RETURN (::tempnam (dir, pfx), char *, 0);
#endif /* VXWORKS */
}
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index d4b42f231bc..fefff467ebf 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -163,6 +163,7 @@
#define ACE_LACKS_SYSV_SHMEM
#define ACE_LACKS_SYS_NERR
#define ACE_LACKS_TELLDIR
+#define ACE_LACKS_TEMPNAM
#define ACE_LACKS_TIMESPEC_T
#define ACE_LACKS_TRUNCATE
#define ACE_LACKS_UCONTEXT_H