diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-07 08:25:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-07 08:25:03 +0000 |
| commit | 2efcff514eb54042fcc9cce493712cf716428230 (patch) | |
| tree | 34ea15790832cf2d3374f2ba143774290d3ed97b | |
| parent | 7a3501c4f0113792ce2b0aa571dc6a68b15fdb4b (diff) | |
| download | ATCD-2efcff514eb54042fcc9cce493712cf716428230.tar.gz | |
ChangeLogTag: Fri Jun 2 12:20:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/OS_NS_Thread.cpp | 6 | ||||
| -rw-r--r-- | ace/os_include/sys/os_stat.h | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp index 09139792efd..c27f6bf90f5 100644 --- a/ace/OS_NS_Thread.cpp +++ b/ace/OS_NS_Thread.cpp @@ -3893,8 +3893,8 @@ ACE_OS::thr_create (ACE_THR_FUNC func, stacksize = ACE_NEEDS_HUGE_THREAD_STACKSIZE; # endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */ -# if !defined (ACE_VXWORKS) - // On VxWorks , using the task API, the OS will provide a task name if +# if !(defined (ACE_VXWORKS) && !defined (ACE_HAS_PTHREADS)) + // On VxWorks, using the task API, the OS will provide a task name if // the user doesn't. So, we don't need to create a tmp_thr. If the // caller of this member function is the Thread_Manager, than thr_id // will be non-zero anyways. @@ -3902,7 +3902,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, if (thr_id == 0) thr_id = &tmp_thr; -# endif /* !ACE_VXWORKS */ +# endif /* !(ACE_VXWORKS && !ACE_HAS_PTHREADS) */ ACE_hthread_t tmp_handle; if (thr_handle == 0) diff --git a/ace/os_include/sys/os_stat.h b/ace/os_include/sys/os_stat.h index a8135b831d2..0c4a703f5f2 100644 --- a/ace/os_include/sys/os_stat.h +++ b/ace/os_include/sys/os_stat.h @@ -119,16 +119,6 @@ extern "C" }; #endif /* ACE_HAS_WINCE */ -#if defined (__BORLANDC__) -# if (__BORLANDC__ <= 0x540) -# define _stat stat -# endif -# if (__BORLANDC__ < 0x560) -# define _umask umask -# define _fstat fstat -# endif -#endif /* __BORLANDC__ */ - #ifdef __cplusplus } #endif /* __cplusplus */ |