1 files changed, 8 insertions, 6 deletions
diff --git a/ace/OS.h b/ace/OS.h
index 0d8048da26f..206bff478f4 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -503,12 +503,7 @@ typedef struct
 } ACE_sema_t;
 #endif /* ACE_HAS_POSIX_SEM */
 
-#if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_STHREADS)
-#include <synch.h>
-#include <thread.h>
-#endif /* ACE_HAS_STHREADS */
-
+#if !defined (PTHREAD_CANCEL_ENABLE)
 struct cancel_state
 {
   int cancelstate;
@@ -518,6 +513,13 @@ struct cancel_state
   int canceltype;
   // e.g., PTHREAD_CANCEL_DEFERRED and PTHREAD_CANCEL_ASYNCHRONOUS.
 };
+#endif /* PTHREAD_CANCEL_ENABLE */
+
+#if defined (ACE_HAS_THREADS)
+#if defined (ACE_HAS_STHREADS)
+#include <synch.h>
+#include <thread.h>
+#endif /* ACE_HAS_STHREADS */
 
 #if defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)
 // Definitions for mapping POSIX pthreads onto Solaris threads.