summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/exec/rtems/ChangeLog5
-rw-r--r--c/src/exec/rtems/include/rtems.h2
-rw-r--r--c/src/exec/rtems/src/signalcatch.c2
-rw-r--r--cpukit/rtems/ChangeLog5
-rw-r--r--cpukit/rtems/include/rtems.h2
-rw-r--r--cpukit/rtems/src/signalcatch.c2
6 files changed, 14 insertions, 4 deletions
diff --git a/c/src/exec/rtems/ChangeLog b/c/src/exec/rtems/ChangeLog
index 43e8ba1170..a5e12514be 100644
--- a/c/src/exec/rtems/ChangeLog
+++ b/c/src/exec/rtems/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-22 Michael Hamel <mhamel@adi.co.nz>
+
+ * include/rtems.h, src/signalcatch.c: Modifications to make
+ CodeWarrior happy.
+
2000-12-06 Joel Sherrill <joel@OARcorp.com>
* src/regiongetinfo.c: Removed unused variable to eliminate warning.
diff --git a/c/src/exec/rtems/include/rtems.h b/c/src/exec/rtems/include/rtems.h
index e8a13eeaba..99457be2f0 100644
--- a/c/src/exec/rtems/include/rtems.h
+++ b/c/src/exec/rtems/include/rtems.h
@@ -30,7 +30,7 @@ extern "C" {
* Define this at your own risk.
*/
-#if !defined(__RTEMS_VIOLATE_KERNEL_VISIBILITY__) && !defined(__RTEMS_INSIDE__)
+#if (!defined(__RTEMS_VIOLATE_KERNEL_VISIBILITY__)) && (!defined(__RTEMS_INSIDE__))
#define __RTEMS_APPLICATION__
#endif
diff --git a/c/src/exec/rtems/src/signalcatch.c b/c/src/exec/rtems/src/signalcatch.c
index d07d1d5fca..676c99b4b6 100644
--- a/c/src/exec/rtems/src/signalcatch.c
+++ b/c/src/exec/rtems/src/signalcatch.c
@@ -48,7 +48,7 @@ rtems_status_code rtems_signal_catch(
/* XXX normalize mode */
executing = _Thread_Executing;
- api = executing->API_Extensions[ THREAD_API_RTEMS ];
+ api = (RTEMS_API_Control*)executing->API_Extensions[ THREAD_API_RTEMS ];
asr = &api->Signal;
_Thread_Disable_dispatch(); /* cannot reschedule while */
diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog
index 43e8ba1170..a5e12514be 100644
--- a/cpukit/rtems/ChangeLog
+++ b/cpukit/rtems/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-22 Michael Hamel <mhamel@adi.co.nz>
+
+ * include/rtems.h, src/signalcatch.c: Modifications to make
+ CodeWarrior happy.
+
2000-12-06 Joel Sherrill <joel@OARcorp.com>
* src/regiongetinfo.c: Removed unused variable to eliminate warning.
diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h
index e8a13eeaba..99457be2f0 100644
--- a/cpukit/rtems/include/rtems.h
+++ b/cpukit/rtems/include/rtems.h
@@ -30,7 +30,7 @@ extern "C" {
* Define this at your own risk.
*/
-#if !defined(__RTEMS_VIOLATE_KERNEL_VISIBILITY__) && !defined(__RTEMS_INSIDE__)
+#if (!defined(__RTEMS_VIOLATE_KERNEL_VISIBILITY__)) && (!defined(__RTEMS_INSIDE__))
#define __RTEMS_APPLICATION__
#endif
diff --git a/cpukit/rtems/src/signalcatch.c b/cpukit/rtems/src/signalcatch.c
index d07d1d5fca..676c99b4b6 100644
--- a/cpukit/rtems/src/signalcatch.c
+++ b/cpukit/rtems/src/signalcatch.c
@@ -48,7 +48,7 @@ rtems_status_code rtems_signal_catch(
/* XXX normalize mode */
executing = _Thread_Executing;
- api = executing->API_Extensions[ THREAD_API_RTEMS ];
+ api = (RTEMS_API_Control*)executing->API_Extensions[ THREAD_API_RTEMS ];
asr = &api->Signal;
_Thread_Disable_dispatch(); /* cannot reschedule while */