This is an automated email from the ASF dual-hosted git repository.

GUIDINGLI pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 8ceb7dbbc029f16bba4d01de8ab2773ca4e74527
Author: tengshuangshuang <[email protected]>
AuthorDate: Thu May 22 17:47:24 2025 +0800

    include: Don't include pthread.h in nuttx/userspace.h
    
    Don't include pthread.h in nuttx/userspace.h to avoid including the
    unnecessary header file (main_t is already in sys/types.h), and add the
    headers that the users of nuttx/userspace.h relied on.
    
    Signed-off-by: hongfengchen <[email protected]>
---
 drivers/efuse/efuse.c              | 1 +
 drivers/timers/timer.c             | 1 +
 drivers/timers/watchdog.c          | 1 +
 drivers/video/goldfish_camera.c    | 1 +
 include/nuttx/userspace.h          | 1 -
 libs/libc/environ/env_secureexec.c | 1 +
 libs/libc/stdio/lib_vasprintf.c    | 1 +
 libs/libc/string/lib_strdup.c      | 1 +
 libs/libc/string/lib_strndup.c     | 1 +
 libs/libc/time/lib_localtime.c     | 1 +
 net/procfs/net_procfs.c            | 1 +
 11 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/efuse/efuse.c b/drivers/efuse/efuse.c
index 572225df04b..38eee6f687c 100644
--- a/drivers/efuse/efuse.c
+++ b/drivers/efuse/efuse.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <nuttx/debug.h>
 
+#include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
 #include <nuttx/lib/lib.h>
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index f7a782938e5..daa441c8b21 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -38,6 +38,7 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/lib/lib.h>
 #include <nuttx/signal.h>
+#include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/mutex.h>
 #include <nuttx/timers/timer.h>
diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c
index 280d925615f..ca97c7bc004 100644
--- a/drivers/timers/watchdog.c
+++ b/drivers/timers/watchdog.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/clock.h>
 #include <nuttx/fs/fs.h>
+#include <nuttx/kmalloc.h>
 #include <nuttx/irq.h>
 #include <nuttx/lib/lib.h>
 #include <nuttx/list.h>
diff --git a/drivers/video/goldfish_camera.c b/drivers/video/goldfish_camera.c
index c3b6adc07ec..f85a2032ec0 100644
--- a/drivers/video/goldfish_camera.c
+++ b/drivers/video/goldfish_camera.c
@@ -34,6 +34,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/nuttx.h>
+#include <nuttx/kmalloc.h>
 #include <nuttx/kthread.h>
 #include <nuttx/video/imgsensor.h>
 #include <nuttx/video/imgdata.h>
diff --git a/include/nuttx/userspace.h b/include/nuttx/userspace.h
index 0d4c60112ae..039dc682e1f 100644
--- a/include/nuttx/userspace.h
+++ b/include/nuttx/userspace.h
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <signal.h>
-#include <pthread.h>
 
 #include <nuttx/lib/builtin.h>
 
diff --git a/libs/libc/environ/env_secureexec.c 
b/libs/libc/environ/env_secureexec.c
index 12454262c4b..8313afddc79 100644
--- a/libs/libc/environ/env_secureexec.c
+++ b/libs/libc/environ/env_secureexec.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <unistd.h>
 
 #include <nuttx/environ.h>
 #include <nuttx/tls.h>
diff --git a/libs/libc/stdio/lib_vasprintf.c b/libs/libc/stdio/lib_vasprintf.c
index 0346f2567f0..a7e2519fb3d 100644
--- a/libs/libc/stdio/lib_vasprintf.c
+++ b/libs/libc/stdio/lib_vasprintf.c
@@ -26,6 +26,7 @@
 
 #include <nuttx/streams.h>
 #include <nuttx/lib/lib.h>
+#include <nuttx/kmalloc.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/string/lib_strdup.c b/libs/libc/string/lib_strdup.c
index 0bc0350a6dd..db2070c0d7a 100644
--- a/libs/libc/string/lib_strdup.c
+++ b/libs/libc/string/lib_strdup.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/kmalloc.h>
 
 #include <string.h>
 
diff --git a/libs/libc/string/lib_strndup.c b/libs/libc/string/lib_strndup.c
index 1dfca63926e..a0300c13b43 100644
--- a/libs/libc/string/lib_strndup.c
+++ b/libs/libc/string/lib_strndup.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/kmalloc.h>
 
 #include <string.h>
 
diff --git a/libs/libc/time/lib_localtime.c b/libs/libc/time/lib_localtime.c
index 7a172d337ed..43903616d08 100644
--- a/libs/libc/time/lib_localtime.c
+++ b/libs/libc/time/lib_localtime.c
@@ -48,6 +48,7 @@
 #include <string.h>
 #include <limits.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 
diff --git a/net/procfs/net_procfs.c b/net/procfs/net_procfs.c
index a05fd0c6dcb..00d21db3a76 100644
--- a/net/procfs/net_procfs.c
+++ b/net/procfs/net_procfs.c
@@ -42,6 +42,7 @@
 #include <sys/param.h>
 
 #include <nuttx/lib/lib.h>
+#include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/procfs.h>
 #include <nuttx/net/netdev.h>

Reply via email to