ChangeLogTag:Thu Sep 12 17:18:43 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>

5 files changed, 24 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 20601019f7c..aa7312b20bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 12 17:18:43 2002  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Synch.{h,cpp}: Only define the recursive condition support if
+	  we're running on Win32.  Hopefully, this will be generalized for
+ 	  VxWorks at some point.  Thanks to Rob Andzik
+ 	  <andzik@rtlogic.com> for reporting this.
+
 Thu Sep 12 19:29:41 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/Atomic_Op_T.i (dump): Don't try to return a value from a
@@ -894,7 +901,8 @@ Sat Aug 24 12:01:54 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/OS.h: #undef the atop macro so that it won't break the new
 	  ACE_OS::atop() method on FreeBSD.  Thanks to Russell Carter
- 	  <rcarter@pinyon.org> for this report.
+ 	  <rcarter@pinyon.org> and Christophe Juniet
+ 	  <cjuniet@entreview.com> for this report.
 
 	* ace/config-lynxos.h: Added some #defines for LynxOS 4.0.  We'll
 	  leave these comments out for now until we figure out how to add
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 20601019f7c..aa7312b20bf 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Thu Sep 12 17:18:43 2002  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* ace/Synch.{h,cpp}: Only define the recursive condition support if
+	  we're running on Win32.  Hopefully, this will be generalized for
+ 	  VxWorks at some point.  Thanks to Rob Andzik
+ 	  <andzik@rtlogic.com> for reporting this.
+
 Thu Sep 12 19:29:41 2002  Steve Huston  <shuston@riverace.com>
 
         * ace/Atomic_Op_T.i (dump): Don't try to return a value from a
@@ -894,7 +901,8 @@ Sat Aug 24 12:01:54 2002  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/OS.h: #undef the atop macro so that it won't break the new
 	  ACE_OS::atop() method on FreeBSD.  Thanks to Russell Carter
- 	  <rcarter@pinyon.org> for this report.
+ 	  <rcarter@pinyon.org> and Christophe Juniet
+ 	  <cjuniet@entreview.com> for this report.
 
 	* ace/config-lynxos.h: Added some #defines for LynxOS 4.0.  We'll
 	  leave these comments out for now until we figure out how to add
diff --git a/THANKS b/THANKS
index 8018deae773..50808039e2c 100644
--- a/THANKS
+++ b/THANKS
@@ -1576,6 +1576,7 @@ Newton Aird <naird@ix.netcom.com>
 Frederic Motte <frederic.motte@fr.thalesgroup.com>
 Roger Weeks <rogerw@firstlogic.com>
 Gautam Thaker <gthaker@atl.lmco.com>
+Christophe Juniet <cjuniet@entreview.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index d98e167f9ce..dd7de689e61 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -876,7 +876,7 @@ int
 ACE_recursive_mutex_state::reset (ACE_recursive_thread_mutex_t &m)
 {
 #if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
+#if defined (ACE_HAS_RECURSIVE_MUTEXES) && defined (ACE_WIN32)
   // On Windows NT && 2000 the recursive mutex is a CriticalSection.
   m.RecursionCount = 0;
   m.OwningThread = 0;
@@ -897,7 +897,7 @@ int
 ACE_recursive_mutex_state::save (ACE_recursive_thread_mutex_t &m)
 {
 #if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
+#if defined (ACE_HAS_RECURSIVE_MUTEXES) && defined (ACE_WIN32)
   // On Windows NT && 2000 the recurisive mutex is a CriticalSection.
   this->recursion_count_ = m.RecursionCount;
   this->lock_count_ = m.LockCount;
@@ -919,7 +919,7 @@ int
 ACE_recursive_mutex_state::restore (ACE_recursive_thread_mutex_t &m)
 {
 #if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
+#if defined (ACE_HAS_RECURSIVE_MUTEXES) && defined (ACE_WIN32)
   // On Windows NT && 2000 the recurisive mutex is a CriticalSection.
   m.RecursionCount = this->recursion_count_;
   m.LockCount = this->lock_count_;
@@ -988,7 +988,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut
   ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, guard, mutex, -1);
   ACE_recursive_mutex_state mutex_state_holder (mutex);
 
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
+#if defined (ACE_HAS_RECURSIVE_MUTEXES) && defined (ACE_WIN32)
   // Windows automagically increments the count by one in
   // <ACE_OS::cond_*wait()>.
   const int mutex_released = 1;
diff --git a/ace/Synch.h b/ace/Synch.h
index b687226f178..bd96bb4f9f1 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -1793,7 +1793,7 @@ private:
   int restore (ACE_recursive_thread_mutex_t &mutex);
 
   ACE_Recursive_Thread_Mutex &mutex_;
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
+#if defined (ACE_HAS_RECURSIVE_MUTEXES) && defined (ACE_WIN32)
   // On windows the mutex is a CRITICAL_SECTION, so just save
   // everything!
   size_t lock_count_;