*** empty log message ***

1 files changed, 6 insertions, 6 deletions

diff --git a/ace/Task.cpp b/ace/Task.cpp
index c4ab1a39048..009ad53d6b4 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -26,10 +26,10 @@ ACE_Thread_Mutex ACE_Task_Exit::ace_task_lock_;
 // NOTE:  this preprocessor directive should match the one in
 // ACE_Task_Base::svc_run () below.  This prevents the two statics
 // from being defined.
-#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) && ! defined (ACE_HAS_PTHREAD_SIGMASK)
 ACE_Task_Exit *
 ACE_Task_Exit::instance (void)
 {
+#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) && ! defined (ACE_HAS_PTHREAD_SIGMASK) && !defined (ACE_HAS_FSU_PTHREADS)
   ACE_TRACE ("ACE_Task_Exit::instance");
 
   // Determines if we were dynamically allocated.
@@ -46,10 +46,10 @@ ACE_Task_Exit::instance (void)
     }
 
   return ACE_TSS_GET (instance_, ACE_Task_Exit);
-
+#else
+  return 0;
+#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE && ! ACE_HAS_PTHREAD_SIGMASK && ! ACE_HAS_FSU_PTHREADS */
 }
-#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE && ! ACE_HAS_PTHREAD_SIGMASK */
-
 
 // Grab hold of the Task * so that we can close() it in the
 // destructor.
@@ -253,7 +253,7 @@ ACE_Task_Base::svc_run (void *args)
 // 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_PTHREAD_SIGMASK)
+#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) && ! defined (ACE_HAS_PTHREAD_SIGMASK) && !defined (ACE_HAS_FSU_PTHEADS)
   // 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
@@ -267,7 +267,7 @@ ACE_Task_Base::svc_run (void *args)
   // So, threads shouldn't exit that way.  Instead, they should
   // return from svc ().
   ACE_Task_Exit exit_hook;
-#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE && ! ACE_HAS_PTHREAD_SIGMASK */
+#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE && ! ACE_HAS_PTHREAD_SIGMASK && !ACE_HAS_FSU_PTHREADS */
 
   exit_hook.set_task (t);