summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-03-17 22:43:36 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-03-17 22:43:36 +0000
commit7f6888b1ae0e1f4e87ba2176b36a88d0d0370d74 (patch)
treea7beb0e8131ddae4dd88ff0f830b21c584c81526
parente6068ca6be7548b9dd3cfbd7da0f9efaba633f28 (diff)
downloadnuttx-7f6888b1ae0e1f4e87ba2176b36a88d0d0370d74.tar.gz
nuttx-7f6888b1ae0e1f4e87ba2176b36a88d0d0370d74.tar.bz2
nuttx-7f6888b1ae0e1f4e87ba2176b36a88d0d0370d74.zip
Fix botched conditional compilation
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@83 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/include/sched.h2
-rw-r--r--nuttx/sched/os_start.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/include/sched.h b/nuttx/include/sched.h
index 39945c69c..51fa19b95 100644
--- a/nuttx/include/sched.h
+++ b/nuttx/include/sched.h
@@ -94,7 +94,7 @@ typedef enum tstate_e
TSTATE_TASK_INACTIVE = 4, /* BLOCKED - Initialized but not yet activated */
TSTATE_WAIT_SEM = 5, /* BLOCKED - Waiting for a semaphore */
-#ifndef CONFIG_DISABLE_MQUEUE
+#ifndef CONFIG_DISABLE_SIGNALS
TSTATE_WAIT_SIG = 6, /* BLOCKED - Waiting for a signal */
#endif
#ifndef CONFIG_DISABLE_MQUEUE
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c
index 30a8cb587..935eef66d 100644
--- a/nuttx/sched/os_start.c
+++ b/nuttx/sched/os_start.c
@@ -168,7 +168,7 @@ const tasklist_t g_tasklisttable[NUM_TASK_STATES] =
{ &g_readytorun, TRUE }, /* TSTATE_TASK_RUNNING */
{ &g_inactivetasks, FALSE }, /* TSTATE_TASK_INACTIVE */
{ &g_waitingforsemaphore, TRUE }, /* TSTATE_WAIT_SEM */
-#ifndef CONFIG_DISABLE_MQUEUE
+#ifndef CONFIG_DISABLE_SIGNALS
{ &g_waitingforsignal, FALSE }, /* TSTATE_WAIT_SIG */
#endif
#ifndef CONFIG_DISABLE_MQUEUE
@@ -220,7 +220,7 @@ void os_start(void)
dq_init(&g_readytorun);
dq_init(&g_pendingtasks);
dq_init(&g_waitingforsemaphore);
-#ifndef CONFIG_DISABLE_MQUEUE
+#ifndef CONFIG_DISABLE_SIGNALS
dq_init(&g_waitingforsignal);
#endif
#ifndef CONFIG_DISABLE_MQUEUE