diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-27 05:33:26 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-27 05:33:26 +0000 |
| commit | 6ba3bd5a55270d98b7f3e99e7a77b2fce3cac86c (patch) | |
| tree | 73f456fd54bfb558153ce240939c760a4a48a570 /ace/Thread_Manager.cpp | |
| parent | 57120e3a72fc306991991dcfa03fb76f3cdc2d78 (diff) | |
| download | ATCD-6ba3bd5a55270d98b7f3e99e7a77b2fce3cac86c.tar.gz | |
Not to consider ACE_HAS_PTHREAD_SIGMASK when determining where to allocate ACE_Thread_Exit instance.
Diffstat (limited to 'ace/Thread_Manager.cpp')
| -rw-r--r-- | ace/Thread_Manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 6301c5c5367..e0b1896c4b6 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -447,7 +447,7 @@ ACE_Thread_Exit::cleanup (void *instance, void *) ACE_Thread_Exit * ACE_Thread_Exit::instance (void) { -#if (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) && ! defined (ACE_HAS_PTHREAD_SIGMASK) +#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) ACE_TRACE ("ACE_Thread_Exit::instance"); // Determines if we were dynamically allocated. @@ -478,7 +478,7 @@ ACE_Thread_Exit::instance (void) return ACE_TSS_GET (instance_, ACE_Thread_Exit); #else return 0; -#endif /* (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) && ! ACE_HAS_PTHREAD_SIGMASK */ +#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ } // Grab hold of the Task * so that we can close() it in the @@ -573,7 +573,7 @@ ace_thread_manager_adapter (void *args) // ACE_Thread_Exit::instance (). With the Xavier Pthreads package, // the exit_hook in TSS causes a seg fault. So, this works around // that by creating exit_hook on the stack. -#if (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) && ! defined (ACE_HAS_PTHREAD_SIGMASK) +#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) // Obtain our thread-specific exit hook and make sure that it knows // how to clean us up! Note that we never use this pointer directly // (it's stored in thread-specific storage), so it's ok to @@ -587,7 +587,7 @@ ace_thread_manager_adapter (void *args) // So, threads shouldn't exit that way. Instead, they should return // from <svc>. ACE_Thread_Exit exit_hook; -#endif /* (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) && ! ACE_HAS_PTHREAD_SIGMASK */ +#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ // Keep track of the <Thread_Manager> that's associated with this // <exit_hook>. |