5 files changed, 20 insertions, 25 deletions
diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx
index b7cd31161..488016162 100644
--- a/NxWidgets/libnxwidgets/src/ccallback.cxx
+++ b/NxWidgets/libnxwidgets/src/ccallback.cxx
@@ -145,7 +145,6 @@ void CCallback::position(NXHANDLE hwnd,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y,
         arg);
 
-
   // The argument must be the CCallback instance
 
   CCallback *This = (CCallback *)arg;
diff --git a/nuttx/configs/stm3240g-eval/knxwm/defconfig b/nuttx/configs/stm3240g-eval/knxwm/defconfig
index 16d54d27a..e0b37586b 100644
--- a/nuttx/configs/stm3240g-eval/knxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/knxwm/defconfig
@@ -856,16 +856,13 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+# CONFIG_NETUTILS_RESOLV is not set
 # CONFIG_NETUTILS_SMTP is not set
-CONFIG_NETUTILS_TELNETD=y
-CONFIG_NETUTILS_TFTPC=y
+# CONFIG_NETUTILS_TELNETD is not set
+# CONFIG_NETUTILS_TFTPC is not set
 # CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_UIPLIB=y
-CONFIG_NETUTILS_WEBCLIENT=y
-CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
+# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
 # FreeModBus
diff --git a/nuttx/include/nuttx/wqueue.h b/nuttx/include/nuttx/wqueue.h
index e1b9de91c..010d503ad 100644
--- a/nuttx/include/nuttx/wqueue.h
+++ b/nuttx/include/nuttx/wqueue.h
@@ -96,15 +96,19 @@
    */
 
 #  ifndef __KERNEL__
+
 #    undef CONFIG_SCHED_HPWORK
 #    undef CONFIG_SCHED_LPWORK
 
+#    ifndef CONFIG_SCHED_USRWORK
+#      undef CONFIG_SCHED_WORKQUEUE
+#    endif
+
   /* User-space worker threads are not built in a kernel build when we are
-   * building the kernel-space libraries.
+   * building the kernel-space libraries (but we still need to know that it
+   * is configured).
    */
 
-#  else
-#    undef CONFIG_SCHED_USRWORK
 #  endif
 
   /* User-space worker threads are not built in a flat build
@@ -136,17 +140,11 @@
 #  undef CONFIG_SCHED_LPWORK
 #endif
 
-/* We might not be building any work queue support in this context */
-
-#if !defined(CONFIG_SCHED_HPWORK) && !defined(CONFIG_SCHED_LPWORK) && !defined(CONFIG_SCHED_USRWORK)
-#  undef CONFIG_SCHED_WORKQUEUE
-#endif
-
 #ifdef CONFIG_SCHED_WORKQUEUE
 
 /* We are building work queues... Work queues need signal support */
 
-#if defined(CONFIG_SCHED_WORKQUEUE) && defined(CONFIG_DISABLE_SIGNALS)
+#ifdef CONFIG_DISABLE_SIGNALS
 #  warning "Worker thread support requires signals"
 #endif
 
@@ -377,7 +375,7 @@ int work_hpthread(int argc, char *argv[]);
 int work_lpthread(int argc, char *argv[]);
 #endif
 
-#ifdef CONFIG_SCHED_USRWORK
+#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__)
 int work_usrthread(int argc, char *argv[]);
 #endif
 
@@ -396,7 +394,7 @@ int work_usrthread(int argc, char *argv[]);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SCHED_USRWORK
+#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__)
 int work_usrstart(void);
 #endif
 
diff --git a/nuttx/libc/wqueue/work_thread.c b/nuttx/libc/wqueue/work_thread.c
index b534ab46d..f9de89976 100644
--- a/nuttx/libc/wqueue/work_thread.c
+++ b/nuttx/libc/wqueue/work_thread.c
@@ -231,7 +231,7 @@ static void work_process(FAR struct wqueue_s *wqueue)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SCHED_HPWORK
+#if defined(CONFIG_SCHED_HPWORK)
 
 int work_hpthread(int argc, char *argv[])
 {
@@ -290,7 +290,7 @@ int work_lpthread(int argc, char *argv[])
 #endif /* CONFIG_SCHED_LPWORK */
 #endif /* CONFIG_SCHED_HPWORK */
 
-#ifdef CONFIG_SCHED_USRWORK
+#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__)
 
 int work_usrthread(int argc, char *argv[])
 {
diff --git a/nuttx/libc/wqueue/work_usrstart.c b/nuttx/libc/wqueue/work_usrstart.c
index 696bf04aa..2b3ee3c67 100644
--- a/nuttx/libc/wqueue/work_usrstart.c
+++ b/nuttx/libc/wqueue/work_usrstart.c
@@ -46,7 +46,8 @@
 
 #include <nuttx/wqueue.h>
 
-#if defined(CONFIG_SCHED_WORKQUEUE) && defined(CONFIG_SCHED_USRWORK)
+#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__) && \
+    defined(CONFIG_SCHED_WORKQUEUE) && defined(CONFIG_SCHED_USRWORK)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -111,4 +112,4 @@ int work_usrstart(void)
   return g_usrwork[USRWORK].pid;
 }
 
-#endif /* CONFIG_SCHED_WORKQUEUE && CONFIG_SCHED_USRWORK */
+#endif /* CONFIG_NUTTX_KERNEL && !__KERNEL__ CONFIG_SCHED_WORKQUEUE && CONFIG_SCHED_USRWORK */