4 files changed, 7 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index cfa41d8181e..73f201d0ced 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 13 13:29:28 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Condition_Attributes.h:
+        * ace/Condition_Attributes.inl:
+        * ace/Condition_Attributes.cpp:
+          Now also needed in single threaded builds
+
 Mon Nov 12 19:26:41 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Malloc.cpp:
diff --git a/ACE/ace/Condition_Attributes.cpp b/ACE/ace/Condition_Attributes.cpp
index 45534e0a7c3..265a7432f41 100644
--- a/ACE/ace/Condition_Attributes.cpp
+++ b/ACE/ace/Condition_Attributes.cpp
@@ -12,10 +12,6 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Condition_Attributes.h"
 
-#if defined (ACE_HAS_THREADS)
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Condition_Attributes.inl"
 #endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_THREADS */
diff --git a/ACE/ace/Condition_Attributes.h b/ACE/ace/Condition_Attributes.h
index fef2a52103e..11c37fbad49 100644
--- a/ACE/ace/Condition_Attributes.h
+++ b/ACE/ace/Condition_Attributes.h
@@ -24,10 +24,6 @@
 
 #include "ace/OS_NS_Thread.h"
 
-#if defined (ACE_HAS_THREADS)
-
-// ACE platform supports some form of threading.
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Export ACE_Condition_Attributes
@@ -95,7 +91,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #include "ace/Condition_Attributes.inl"
 #endif /* __ACE_INLINE__ */
 
-#endif /* !ACE_HAS_THREADS */
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONDITION_ATTRIBUTES_H */
diff --git a/ACE/ace/Condition_Attributes.inl b/ACE/ace/Condition_Attributes.inl
index be524f7c06a..48825e294d3 100644
--- a/ACE/ace/Condition_Attributes.inl
+++ b/ACE/ace/Condition_Attributes.inl
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL