From 89b85e510043235a115fe02b4ea97712a23cfd2b Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 16 Jul 2010 08:46:29 +0000
Subject: 2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>

	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
---
 cpukit/score/cpu/m68k/rtems/score/cpu.h   | 10 ++--------
 cpukit/score/cpu/m68k/rtems/score/types.h | 11 ++---------
 2 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'cpukit/score/cpu/m68k/rtems')

diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index b4e1780bc6..e94034225c 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -23,14 +23,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/m68k.h>              /* pick up machine definitions */
-#ifndef ASM
-  #include <rtems/score/types.h>
-#else
-  /* FIXME */
-  #define TRUE 1
-  #define FALSE 0
-#endif
+#include <rtems/score/types.h>
+#include <rtems/score/m68k.h>
 
 /* conditional compilation parameters */
 
diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/rtems/score/types.h
index 4f756ffed2..1cd45ab1a2 100644
--- a/cpukit/score/cpu/m68k/rtems/score/types.h
+++ b/cpukit/score/cpu/m68k/rtems/score/types.h
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t     Priority_Bit_map_control;
 typedef void m68k_isr;
 typedef void ( *m68k_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3