From 2c81ddf0d3cca467c0a9d484d914843ec1c3a8ae Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 3 Feb 2013 18:36:46 +0000 Subject: [PATCH] Make the names of the execsem consistent; Need defaults for some CONFIG_ settings git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5605 42af7a65-404d-4744-a932-0658087f49c3 --- sched/spawn_internal.h | 4 ++++ sched/task_posixspawn.c | 4 ++-- sched/task_spawn.c | 8 ++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sched/spawn_internal.h b/sched/spawn_internal.h index 6520f39477..89021226a3 100644 --- a/sched/spawn_internal.h +++ b/sched/spawn_internal.h @@ -47,6 +47,10 @@ * Pre-processor Definitions ****************************************************************************/ +#ifndef CONFIG_POSIX_SPAWN_PROXY_STACKSIZE +# define CONFIG_POSIX_SPAWN_PROXY_STACKSIZE 1024 +#endif + /**************************************************************************** * Public Type Definitions ****************************************************************************/ diff --git a/sched/task_posixspawn.c b/sched/task_posixspawn.c index 1b3afdaf37..7fc90c9fa9 100644 --- a/sched/task_posixspawn.c +++ b/sched/task_posixspawn.c @@ -233,7 +233,7 @@ static int posix_spawn_proxy(int argc, FAR char *argv[]) g_spawn_parms.result = ret; #ifndef CONFIG_SCHED_WAITPID - spawn_semgive(&g_posix_spawn_execsem); + spawn_semgive(&g_spawn_execsem); #endif return OK; } @@ -445,7 +445,7 @@ int posix_spawn(FAR pid_t *pid, FAR const char *path, goto errout_with_lock; } #else - spawn_semtake(&g_posix_spawn_execsem); + spawn_semtake(&g_spawn_execsem); #endif /* Get the result and relinquish our access to the parameter structure */ diff --git a/sched/task_spawn.c b/sched/task_spawn.c index ec6408df1a..2456d777c5 100644 --- a/sched/task_spawn.c +++ b/sched/task_spawn.c @@ -52,10 +52,6 @@ * Pre-processor Definitions ****************************************************************************/ -#ifndef CONFIG_POSIX_SPAWN_PROXY_STACKSIZE -# define CONFIG_POSIX_SPAWN_PROXY_STACKSIZE 1024 -#endif - /**************************************************************************** * Private Types ****************************************************************************/ @@ -240,7 +236,7 @@ static int task_spawn_proxy(int argc, FAR char *argv[]) g_spawn_parms.result = ret; #ifndef CONFIG_SCHED_WAITPID - spawn_semgive(&g_task_spawn_execsem); + spawn_semgive(&g_spawn_execsem); #endif return OK; } @@ -416,7 +412,7 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry, goto errout_with_lock; } #else - spawn_semtake(&g_task_spawn_execsem); + spawn_semtake(&g_spawn_execsem); #endif /* Get the result and relinquish our access to the parameter structure */