diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-11 16:27:24 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-11 16:27:24 -0600 |
| commit | bc478796303d4c69b8eb1739ed940e04ffe9d500 (patch) | |
| tree | d6fe41d512d7a06b1639d8051be0c253d3ecab2c | |
| parent | 4c8cf8976438d8287c473783978da6a6641eb808 (diff) | |
| download | px4-nuttx-bc478796303d4c69b8eb1739ed940e04ffe9d500.tar.gz px4-nuttx-bc478796303d4c69b8eb1739ed940e04ffe9d500.tar.bz2 px4-nuttx-bc478796303d4c69b8eb1739ed940e04ffe9d500.zip | |
Fix some compiler errors in user-work queue configuration that crept in the last bunch of commits
| -rw-r--r-- | nuttx/libc/wqueue/work_lock.c | 2 | ||||
| -rw-r--r-- | nuttx/libc/wqueue/work_signal.c | 2 | ||||
| -rw-r--r-- | nuttx/libc/wqueue/work_usrthread.c | 4 | ||||
| -rw-r--r-- | nuttx/libc/wqueue/wqueue.h | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/nuttx/libc/wqueue/work_lock.c b/nuttx/libc/wqueue/work_lock.c index d6aea231e..6ae5d11e8 100644 --- a/nuttx/libc/wqueue/work_lock.c +++ b/nuttx/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/nuttx/libc/wqueue/work_signal.c b/nuttx/libc/wqueue/work_signal.c index 01c492af7..7e0cfb1ad 100644 --- a/nuttx/libc/wqueue/work_signal.c +++ b/nuttx/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/nuttx/libc/wqueue/work_usrthread.c b/nuttx/libc/wqueue/work_usrthread.c index 9fbe560ee..39f5951c2 100644 --- a/nuttx/libc/wqueue/work_usrthread.c +++ b/nuttx/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/nuttx/libc/wqueue/wqueue.h b/nuttx/libc/wqueue/wqueue.h index 05b6a1223..6075ea00e 100644 --- a/nuttx/libc/wqueue/wqueue.h +++ b/nuttx/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 |