From 0c1c37bae23cf0a5256bc3a9197ecff799a233bf Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 11 Oct 2014 16:27:24 -0600
Subject: [PATCH] Fix some compiler errors in user-work queue configuration
 that crept in the last bunch of commits

---
 libc/wqueue/work_lock.c      | 2 +-
 libc/wqueue/work_signal.c    | 2 --
 libc/wqueue/work_usrthread.c | 4 ++--
 libc/wqueue/wqueue.h         | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libc/wqueue/work_lock.c b/libc/wqueue/work_lock.c
index d6aea231ee..6ae5d11e83 100644
--- a/libc/wqueue/work_lock.c
+++ b/libc/wqueue/work_lock.c
@@ -94,7 +94,7 @@ int work_lock(void)
   int ret;
 
 #ifdef CONFIG_BUILD_PROTECTED
-  int ret = sem_wait(&g_usrsem);
+  ret = sem_wait(&g_usrsem);
   if (ret < 0)
     {
       DEBUGASSERT(errno == EINTR);
diff --git a/libc/wqueue/work_signal.c b/libc/wqueue/work_signal.c
index 01c492af75..7e0cfb1ade 100644
--- a/libc/wqueue/work_signal.c
+++ b/libc/wqueue/work_signal.c
@@ -87,8 +87,6 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__)
-
 int work_signal(int qid)
 {
   int ret;
diff --git a/libc/wqueue/work_usrthread.c b/libc/wqueue/work_usrthread.c
index 9fbe560ee1..39f5951c23 100644
--- a/libc/wqueue/work_usrthread.c
+++ b/libc/wqueue/work_usrthread.c
@@ -87,9 +87,9 @@ struct usr_wqueue_s g_usrwork;
 /* This semaphore supports exclusive access to the user-mode work queue */
 
 #ifdef CONFIG_BUILD_PROTECTED
-extern sem_t g_usrsem;
+sem_t g_usrsem;
 #else
-extern pthread_mutex_t g_usrmutex;
+pthread_mutex_t g_usrmutex;
 #endif
 
 /****************************************************************************
diff --git a/libc/wqueue/wqueue.h b/libc/wqueue/wqueue.h
index 05b6a12235..6075ea00e8 100644
--- a/libc/wqueue/wqueue.h
+++ b/libc/wqueue/wqueue.h
@@ -81,7 +81,6 @@ extern sem_t g_usrsem;
 #else
 extern pthread_mutex_t g_usrmutex;
 #endif
-#endif
 
 /****************************************************************************
  * Public Function Prototypes