summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2012-11-07 12:33:48 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2012-11-13 09:20:57 +0100
commitecf98585043294323daad5dd5ac4b344a7c39856 (patch)
tree817798c28df1f621bf6bac44ac6cb2df7935b3a3
parentscore: Statically initialize user extensions (diff)
downloadrtems-ecf98585043294323daad5dd5ac4b344a7c39856.tar.bz2
score: Move global variables definition
Define _System_state_Current and _Internal_errors_What_happened in interr.c to make _Internal_error_Occurred() more independent.
-rw-r--r--cpukit/score/include/rtems/score/interr.h2
-rw-r--r--cpukit/score/include/rtems/score/sysstate.h2
-rw-r--r--cpukit/score/src/interr.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h
index 2a21fe01eb..0ba0750c6f 100644
--- a/cpukit/score/include/rtems/score/interr.h
+++ b/cpukit/score/include/rtems/score/interr.h
@@ -93,7 +93,7 @@ typedef struct {
/**
* When a fatal error occurs, the error information is stored here.
*/
-SCORE_EXTERN Internal_errors_Information _Internal_errors_What_happened;
+extern Internal_errors_Information _Internal_errors_What_happened;
/**
* @brief Internal error Occurred
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h
index c81e9c3f73..b847dc842f 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/cpukit/score/include/rtems/score/sysstate.h
@@ -78,7 +78,7 @@ typedef enum {
SCORE_EXTERN bool _System_state_Is_multiprocessing;
#endif
-SCORE_EXTERN System_state_Codes _System_state_Current;
+extern System_state_Codes _System_state_Current;
/*
* Make it possible for the application to get the system state information.
diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c
index 3679511189..a9f1efc8b9 100644
--- a/cpukit/score/src/interr.c
+++ b/cpukit/score/src/interr.c
@@ -18,6 +18,10 @@
#include <rtems/score/sysstate.h>
#include <rtems/score/userext.h>
+System_state_Codes _System_state_Current;
+
+Internal_errors_Information _Internal_errors_What_happened;
+
/*
* _Internal_error_Occurred
*