diff options
| author | cdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-16 21:23:53 +0000 |
|---|---|---|
| committer | cdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-16 21:23:53 +0000 |
| commit | 30772484d584ad77092263d4cbae68b95931ab25 (patch) | |
| tree | 001421cd6d012f17d9159d82cf7ba1ddd7dbc9c2 /ace/OS.cpp | |
| parent | 38552aab998493110534c4e8ff9b13822f2ea9e1 (diff) | |
| download | ATCD-30772484d584ad77092263d4cbae68b95931ab25.tar.gz | |
pSOS MIPS patches from Jaepil Kim
Diffstat (limited to 'ace/OS.cpp')
| -rw-r--r-- | ace/OS.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index 40824747ef4..3aa3cb7c6e6 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -5015,12 +5015,17 @@ ACE_OS::ctime_r (const time_t *clock, time_t ACE_OS::mktime (struct tm *t) { - // ACE_TRACE ("ACE_OS::asctime"); -# if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_MT_SAFE_MKTIME) + // ACE_TRACE ("ACE_OS::mktime"); +# if defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME) + ACE_UNUSED_ARG (t); + ACE_NOTSUP_RETURN (-1); +# else +# if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_MT_SAFE_MKTIME) ACE_OS_GUARD -# endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ +# endif /* ACE_HAS_THREADS && ! ACE_HAS_MT_SAFE_MKTIME */ ACE_OSCALL_RETURN (::mktime (t), time_t, (time_t) -1); +# endif /* ACE_PSOS && ! ACE_PSOS_HAS_TIME */ } # endif /* !ACE_HAS_WINCE */ @@ -5091,7 +5096,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, } # endif /* ! ACE_HAS_THREADS || ACE_LACKS_RWLOCK_T */ -#if defined (ACE_LACKS_COND_T) +#if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS) // NOTE: The ACE_OS::cond_* functions for some non-Unix platforms are // defined here either because they're too big to be inlined, or // to avoid use before definition if they were inline. @@ -5847,7 +5852,7 @@ ACE_PSOS_Time_t::init_simulator_time (void) // Static member function to initialize system time, using UNIX calls. # endif /* ACE_PSOSIM */ -# endif /* ACE_PSOS */ +# endif /* ACE_PSOS && ! ACE_PSOS_DIAB_MIPS */ # if defined (__DGUX) && defined (ACE_HAS_THREADS) && defined (_POSIX4A_DRAFT10_SOURCE) extern "C" int __d6_sigwait (sigset_t *set); |