From d15bae699db57cf37dcfb2cb5a6813ff79b2bd7f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 10 Jun 2009 17:10:59 +0000 Subject: [PATCH] 2009-06-10 Joel Sherrill * sapi/include/confdefs.h: Fix minor error when application has its own initialization task table. --- cpukit/ChangeLog | 5 +++++ cpukit/sapi/include/confdefs.h | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index deaa82bd5d..90672e1f76 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2009-06-10 Joel Sherrill + + * sapi/include/confdefs.h: Fix minor error when application has its own + initialization task table. + 2009-06-08 Joel Sherrill * score/src/heapwalk.c: Verify addresses are aligned. diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 52a611b5f0..094ce1ac54 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -1900,7 +1900,8 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * then we need to install the code that runs that loop. */ #ifdef CONFIGURE_INIT - #ifdef CONFIGURE_RTEMS_INIT_TASKS_TABLE + #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) || \ + defined(CONFIGURE_HAS_OWN_INIT_TASK_TABLE) void (_RTEMS_tasks_Initialize_user_tasks_body)(void); void (*_RTEMS_tasks_Initialize_user_tasks_p)(void) = _RTEMS_tasks_Initialize_user_tasks_body; @@ -1915,7 +1916,8 @@ rtems_fs_init_functions_t rtems_fs_init_helper = */ #ifdef RTEMS_POSIX_API #ifdef CONFIGURE_INIT - #ifdef CONFIGURE_POSIX_INIT_THREAD_TABLE + #if defined(CONFIGURE_POSIX_INIT_THREAD_TABLE) || \ + defined(CONFIGURE_POSIX_HAS_OWN_INIT_THREAD_TABLE) void _POSIX_Threads_Initialize_user_threads_body(void); void (*_POSIX_Threads_Initialize_user_threads_p)(void) = _POSIX_Threads_Initialize_user_threads_body; @@ -1931,7 +1933,8 @@ rtems_fs_init_functions_t rtems_fs_init_helper = */ #ifdef RTEMS_ITRON_API #ifdef CONFIGURE_INIT - #ifdef CONFIGURE_ITRON_INIT_TASK_TABLE + #if defined(CONFIGURE_ITRON_INIT_TASK_TABLE) || \ + defined(CONFIGURE_ITRON_HAS_OWN_INIT_TASK_TABLE) void _ITRON_Task_Initialize_user_tasks_body(void); void (*_ITRON_Initialize_user_tasks_p)(void) = _ITRON_Task_Initialize_user_tasks_body;