summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/exec/score/ChangeLog5
-rw-r--r--c/src/exec/score/src/threadhandler.c6
-rw-r--r--cpukit/score/ChangeLog5
-rw-r--r--cpukit/score/src/threadhandler.c6
4 files changed, 16 insertions, 6 deletions
diff --git a/c/src/exec/score/ChangeLog b/c/src/exec/score/ChangeLog
index 7f4174c23a..77b14250c3 100644
--- a/c/src/exec/score/ChangeLog
+++ b/c/src/exec/score/ChangeLog
@@ -1,4 +1,9 @@
+2001-10-22 Joel Sherrill <joel@OARcorp.com>
+
+ * src/threadhandler.c: Use __USE_INIT_FINI__ since USE_INIT_FINI
+ pollutes the application namespace.
+
2001-10-16 Joel Sherrill <joel@OARcorp.com>
* .cvsignore: Add stamp-h.in.
diff --git a/c/src/exec/score/src/threadhandler.c b/c/src/exec/score/src/threadhandler.c
index d3755f4466..84618751fd 100644
--- a/c/src/exec/score/src/threadhandler.c
+++ b/c/src/exec/score/src/threadhandler.c
@@ -58,7 +58,7 @@ void _Thread_Handler( void )
{
ISR_Level level;
Thread_Control *executing;
-#ifdef USE_INIT_FINI
+#if defined(__USE_INIT_FINI__)
static char doneConstructors;
char doneCons;
#endif
@@ -73,7 +73,7 @@ void _Thread_Handler( void )
level = executing->Start.isr_level;
_ISR_Set_level(level);
-#ifdef USE_INIT_FINI
+#if defined(__USE_INIT_FINI__)
doneCons = doneConstructors;
doneConstructors = 1;
#endif
@@ -91,7 +91,7 @@ void _Thread_Handler( void )
*/
_Thread_Enable_dispatch();
-#ifdef USE_INIT_FINI
+#if defined(__USE_INIT_FINI__)
if (!doneCons)
_init ();
#endif
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index 7f4174c23a..77b14250c3 100644
--- a/cpukit/score/ChangeLog
+++ b/cpukit/score/ChangeLog
@@ -1,4 +1,9 @@
+2001-10-22 Joel Sherrill <joel@OARcorp.com>
+
+ * src/threadhandler.c: Use __USE_INIT_FINI__ since USE_INIT_FINI
+ pollutes the application namespace.
+
2001-10-16 Joel Sherrill <joel@OARcorp.com>
* .cvsignore: Add stamp-h.in.
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index d3755f4466..84618751fd 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -58,7 +58,7 @@ void _Thread_Handler( void )
{
ISR_Level level;
Thread_Control *executing;
-#ifdef USE_INIT_FINI
+#if defined(__USE_INIT_FINI__)
static char doneConstructors;
char doneCons;
#endif
@@ -73,7 +73,7 @@ void _Thread_Handler( void )
level = executing->Start.isr_level;
_ISR_Set_level(level);
-#ifdef USE_INIT_FINI
+#if defined(__USE_INIT_FINI__)
doneCons = doneConstructors;
doneConstructors = 1;
#endif
@@ -91,7 +91,7 @@ void _Thread_Handler( void )
*/
_Thread_Enable_dispatch();
-#ifdef USE_INIT_FINI
+#if defined(__USE_INIT_FINI__)
if (!doneCons)
_init ();
#endif