summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/score/include/rtems/system.h6
2 files changed, 11 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 0966247a16..d56c73af61 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * score/include/rtems/system.h: Fix warnings about TRUE/FALSE not
+ defined on ARM target. This file need to be clean from .S files.
+
2010-04-05 Thomas Znidar <t.znidar@embed-it.com>
* libmisc/monitor/mon-monitor.c, libmisc/monitor/monitor.h: Add reset
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 11dac214d7..0993f1e632 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -149,6 +149,7 @@ extern "C" {
#define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE
#endif
+#ifndef ASM
#ifdef RTEMS_POSIX_API
/** The following is used by the POSIX implementation to catch bad paths. */
int POSIX_NOT_IMPLEMENTED( void );
@@ -164,6 +165,7 @@ int POSIX_NOT_IMPLEMENTED( void );
typedef void * proc_ptr;
#include <stddef.h>
+#endif
#if !defined( TRUE ) || (TRUE != 1)
/** Boolean constant TRUE */
@@ -177,9 +179,12 @@ typedef void * proc_ptr;
#define FALSE (0)
#endif
+#ifndef ASM
#include <stdint.h>
+#endif
#include <rtems/score/cpu.h> /* processor specific information */
+#ifndef ASM
/**
* This macro is used to obtain the offset of a field in a structure.
*/
@@ -200,6 +205,7 @@ extern const char _Copyright_Notice[];
/** This macro defines the maximum length of a Classic API name. */
#define RTEMS_MAXIMUM_NAME_LENGTH sizeof(rtems_name)
+#endif
#ifdef __cplusplus
}