8 files changed, 7 insertions, 12 deletions
diff --git a/cpukit/posix/src/condwait.c b/cpukit/posix/src/condwait.c
index 79ecc2eee5..034b9140e4 100644
--- a/cpukit/posix/src/condwait.c
+++ b/cpukit/posix/src/condwait.c
@@ -39,7 +39,7 @@ int pthread_cond_wait(
   return _POSIX_Condition_variables_Wait_support(
     cond,
     mutex,
-    THREAD_QUEUE_WAIT_FOREVER,
+    WATCHDOG_NO_TIMEOUT,
     false
   );
 }
diff --git a/cpukit/posix/src/mqueuereceive.c b/cpukit/posix/src/mqueuereceive.c
index 6c283fdf7d..493ac79219 100644
--- a/cpukit/posix/src/mqueuereceive.c
+++ b/cpukit/posix/src/mqueuereceive.c
@@ -45,6 +45,6 @@ ssize_t mq_receive(
     msg_len,
     msg_prio,
     true,
-    THREAD_QUEUE_WAIT_FOREVER
+    WATCHDOG_NO_TIMEOUT
   );
 }
diff --git a/cpukit/posix/src/mqueuesend.c b/cpukit/posix/src/mqueuesend.c
index 6dc0f10a8e..01ea896bfd 100644
--- a/cpukit/posix/src/mqueuesend.c
+++ b/cpukit/posix/src/mqueuesend.c
@@ -63,6 +63,6 @@ int mq_send(
     msg_len,
     msg_prio,
     true,
-    THREAD_QUEUE_WAIT_FOREVER
+    WATCHDOG_NO_TIMEOUT
   );
 }
diff --git a/cpukit/posix/src/mutexlock.c b/cpukit/posix/src/mutexlock.c
index cc8ffc2bc1..43114fdaca 100644
--- a/cpukit/posix/src/mutexlock.c
+++ b/cpukit/posix/src/mutexlock.c
@@ -38,5 +38,5 @@ int pthread_mutex_lock(
   pthread_mutex_t           *mutex
 )
 {
-  return _POSIX_Mutex_Lock_support( mutex, true, THREAD_QUEUE_WAIT_FOREVER );
+  return _POSIX_Mutex_Lock_support( mutex, true, WATCHDOG_NO_TIMEOUT );
 }
diff --git a/cpukit/posix/src/mutextrylock.c b/cpukit/posix/src/mutextrylock.c
index 332f486b49..e765e91e8e 100644
--- a/cpukit/posix/src/mutextrylock.c
+++ b/cpukit/posix/src/mutextrylock.c
@@ -37,7 +37,7 @@ int pthread_mutex_trylock(
   pthread_mutex_t           *mutex
 )
 {
-  int r = _POSIX_Mutex_Lock_support( mutex, false, THREAD_QUEUE_WAIT_FOREVER );
+  int r = _POSIX_Mutex_Lock_support( mutex, false, WATCHDOG_NO_TIMEOUT );
   if ( r == EDEADLK )
     r = EBUSY;
   return r;
diff --git a/cpukit/posix/src/semtrywait.c b/cpukit/posix/src/semtrywait.c
index 10b1f60517..addc071144 100644
--- a/cpukit/posix/src/semtrywait.c
+++ b/cpukit/posix/src/semtrywait.c
@@ -35,5 +35,5 @@ int sem_trywait(
   sem_t *sem
 )
 {
-  return _POSIX_Semaphore_Wait_support(sem, false, THREAD_QUEUE_WAIT_FOREVER);
+  return _POSIX_Semaphore_Wait_support(sem, false, WATCHDOG_NO_TIMEOUT);
 }
diff --git a/cpukit/posix/src/semwait.c b/cpukit/posix/src/semwait.c
index b2344f087c..88324e5580 100644
--- a/cpukit/posix/src/semwait.c
+++ b/cpukit/posix/src/semwait.c
@@ -35,5 +35,5 @@ int sem_wait(
   sem_t *sem
 )
 {
-  return _POSIX_Semaphore_Wait_support( sem, true, THREAD_QUEUE_WAIT_FOREVER );
+  return _POSIX_Semaphore_Wait_support( sem, true, WATCHDOG_NO_TIMEOUT );
 }
diff --git a/cpukit/score/include/rtems/score/threadqimpl.h b/cpukit/score/include/rtems/score/threadqimpl.h
index 4c8d22edae..2fa797467b 100644
--- a/cpukit/score/include/rtems/score/threadqimpl.h
+++ b/cpukit/score/include/rtems/score/threadqimpl.h
@@ -32,11 +32,6 @@ extern "C" {
 /**@{*/
 
 /**
- *  Constant for indefinite wait.
- */
-#define THREAD_QUEUE_WAIT_FOREVER  WATCHDOG_NO_TIMEOUT
-
-/**
  *  The following type defines the callout used when a remote task
  *  is extracted from a local thread queue.
  */