Later

2 files changed, 6 insertions, 11 deletions

diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp
index a280f98cd20..5809d8e5649 100644
--- a/netsvcs/clients/Tokens/collection/collection.cpp
+++ b/netsvcs/clients/Tokens/collection/collection.cpp
@@ -129,12 +129,6 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-#if defined (ACE_HAS_PTHREADS)
-#define SUSPEND 0
-#else
-#define SUSPEND THR_SUSPENDED
-#endif
-
 int
 main (int argc, char* argv[])
 {
@@ -185,15 +179,15 @@ main (int argc, char* argv[])
   ACE_Thread_Manager *mgr = ACE_Service_Config::thr_mgr ();
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
-		 (void *) &collectionAR, THR_BOUND | SUSPEND) == -1)
+		 (void *) &collectionAR, THR_BOUND | THR_SUSPENDED) == -1)
     ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 1 failed"), -1);
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
-		 (void *) &collectionAW, THR_BOUND | SUSPEND) == -1)
+		 (void *) &collectionAW, THR_BOUND | THR_SUSPENDED) == -1)
     ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 2 failed"), -1);
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
-		 (void *) &collectionBR, THR_BOUND | SUSPEND) == -1)
+		 (void *) &collectionBR, THR_BOUND | THR_SUSPENDED) == -1)
     ACE_ERROR_RETURN ((LM_DEBUG, "%p\n", "spawn 3 failed"), -1);
 
 #if ! defined (ACE_HAS_PTHREADS)
diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index 1e6f30f0982..625ccf7f9ab 100644
--- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -216,7 +216,8 @@ mutex_test (void)
 {
   ACE_Thread_Manager thr_mgr;
 
-  Two_Tokens one (&thr_mgr), two (&thr_mgr);
+  Two_Tokens one (&thr_mgr);
+  Two_Tokens two (&thr_mgr);
 
   if (remote_mutexes == 0)
     {
@@ -252,7 +253,7 @@ mutex_test (void)
   return 0;
 }
 
-int
+static int
 rwlock_test (void)
 {
   ACE_Thread_Manager thr_mgr;