summaryrefslogtreecommitdiffstats
path: root/cpukit/score
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-18 19:18:52 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-18 19:18:52 +0000
commitf73fc29d6692e721e50a7a595d07faab29048a03 (patch)
treedc0b4c271eb1a035241fc9477db935a7e7163704 /cpukit/score
parent2008-08-18 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-f73fc29d6692e721e50a7a595d07faab29048a03.tar.bz2
2008-08-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* itron/include/rtems/itron/task.h, itron/src/def_cyc.c, itron/src/task.c, libcsupport/src/newlibc_exit.c, libcsupport/src/sync.c, libfs/src/imfs/imfs_fchmod.c, posix/include/rtems/posix/pthread.h, posix/src/pthread.c, posix/src/sysconf.c, rtems/include/rtems/rtems/tasks.h, rtems/src/tasks.c, score/include/rtems/score/stack.h, score/inline/rtems/score/stack.inl, score/inline/rtems/score/thread.inl, score/src/threadhandler.c: Fix various nested-externs warnings.
Diffstat (limited to 'cpukit/score')
-rw-r--r--cpukit/score/include/rtems/score/stack.h7
-rw-r--r--cpukit/score/inline/rtems/score/stack.inl1
-rw-r--r--cpukit/score/inline/rtems/score/thread.inl11
-rw-r--r--cpukit/score/src/threadhandler.c13
4 files changed, 21 insertions, 11 deletions
diff --git a/cpukit/score/include/rtems/score/stack.h b/cpukit/score/include/rtems/score/stack.h
index a4ed0a74bc..758ad36c38 100644
--- a/cpukit/score/include/rtems/score/stack.h
+++ b/cpukit/score/include/rtems/score/stack.h
@@ -48,6 +48,13 @@ typedef struct {
void *area;
} Stack_Control;
+/**
+ * This variable contains the the minimum stack size;
+ *
+ * @note It is instantiated and set by User Configuration via confdefs.h.
+ */
+extern uint32_t rtems_minimum_stack_size;
+
#ifndef __RTEMS_APPLICATION__
#include <rtems/score/stack.inl>
#endif
diff --git a/cpukit/score/inline/rtems/score/stack.inl b/cpukit/score/inline/rtems/score/stack.inl
index 7726cf1a05..b7fb538747 100644
--- a/cpukit/score/inline/rtems/score/stack.inl
+++ b/cpukit/score/inline/rtems/score/stack.inl
@@ -47,7 +47,6 @@ RTEMS_INLINE_ROUTINE void _Stack_Initialize (
*/
RTEMS_INLINE_ROUTINE uint32_t _Stack_Minimum (void)
{
- extern uint32_t rtems_minimum_stack_size;
return rtems_minimum_stack_size;
}
diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl
index d790b4d9c4..ca692aa8a9 100644
--- a/cpukit/score/inline/rtems/score/thread.inl
+++ b/cpukit/score/inline/rtems/score/thread.inl
@@ -150,15 +150,19 @@ RTEMS_INLINE_ROUTINE void _Thread_Deallocate_fp( void )
#if defined(RTEMS_HEAVY_STACK_DEBUG) || defined(RTEMS_HEAVY_MALLOC_DEBUG)
#include <rtems/bspIo.h>
#include <rtems/fatal.h>
+ #include <rtems/stackchk.h>
#include <rtems/score/sysstate.h>
#include <rtems/score/heap.h>
+
+ /*
+ * This is currently not defined in any .h file, so we have to
+ * extern it here.
+ */
+ extern Heap_Control RTEMS_Malloc_Heap;
#endif
RTEMS_INLINE_ROUTINE void _Thread_Disable_dispatch( void )
{
- extern boolean rtems_stack_checker_is_blown( void );
- extern void malloc_walk(size_t, size_t);
-
/*
* This check is very brutal to system performance but is very helpful
* at finding blown stack problems. If you have a stack problem and
@@ -184,7 +188,6 @@ RTEMS_INLINE_ROUTINE void _Thread_Disable_dispatch( void )
*/
#if defined(RTEMS_HEAVY_MALLOC_DEBUG)
if ( _Thread_Dispatch_disable_level == 1 ) {
- extern Heap_Control RTEMS_Malloc_Heap;
_Heap_Walk( &RTEMS_Malloc_Heap,99, FALSE );
}
#endif
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 187ec62f39..22c9f141cc 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -34,6 +34,13 @@
#include <stdlib.h> /* for atexit() */
#endif
+#if defined(__USE_INIT_FINI__)
+ extern void _init(void);
+#endif
+#if defined(__USE__MAIN__)
+ extern void _main(void);
+#endif
+
/*PAGE
*
* _Thread_Handler
@@ -70,12 +77,6 @@ void _Thread_Handler( void )
static char doneConstructors;
char doneCons;
#endif
-#if defined(__USE_INIT_FINI__)
- extern void _init(void);
-#endif
-#if defined(__USE__MAIN__)
- extern void _main(void);
-#endif
executing = _Thread_Executing;