Do not define boolean, single_precision, double_precision unless RTEMS_DEPRECATED_TYPES is given.

12 files changed, 72 insertions, 79 deletions

diff --git a/cpukit/score/cpu/arm/rtems/score/types.h b/cpukit/score/cpu/arm/rtems/score/types.h
index d137153cfb..fd7964d1ab 100644
--- a/cpukit/score/cpu/arm/rtems/score/types.h
+++ b/cpukit/score/cpu/arm/rtems/score/types.h
@@ -33,14 +33,16 @@ extern "C" {
  *  This section defines the basic types for this processor.
  */
 
-typedef bool             boolean;            /* Boolean value   */
 typedef uint16_t         Priority_Bit_map_control;
 
-typedef float              single_precision;   /* single precision float */
-typedef double             double_precision;   /* double precision float */
-
 typedef void               arm_cpu_isr;
-typedef void            ( *arm_cpu_isr_entry )( void );
+typedef void            (*arm_cpu_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
 }
diff --git a/cpukit/score/cpu/avr/rtems/score/types.h b/cpukit/score/cpu/avr/rtems/score/types.h
index 5a242b01d6..e0dcdebf1b 100644
--- a/cpukit/score/cpu/avr/rtems/score/types.h
+++ b/cpukit/score/cpu/avr/rtems/score/types.h
@@ -33,15 +33,15 @@ extern "C" {
  */
 
 typedef uint16_t     Priority_Bit_map_control;
-
-typedef bool         boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
 typedef void avr_isr;
 typedef void ( *avr_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
diff --git a/cpukit/score/cpu/bfin/rtems/score/types.h b/cpukit/score/cpu/bfin/rtems/score/types.h
index 57f5a255ec..c438546d55 100644
--- a/cpukit/score/cpu/bfin/rtems/score/types.h
+++ b/cpukit/score/cpu/bfin/rtems/score/types.h
@@ -31,20 +31,18 @@ extern "C" {
 /** This defines the type for a priority bit map entry. */
 typedef uint16_t Priority_Bit_map_control;
 
-/** This defines the type for a Boolean value, */
-typedef bool boolean;     /* Boolean value   */
-
-/** This defines the type for a single precision float. */
-typedef float          single_precision;
-/** This defines the type for a double precision float. */
-typedef double         double_precision;
-
 /** This defines the return type for an ISR entry point. */
 typedef void blackfin_isr;
 
 /** This defines the prototype for an ISR entry point. */
 typedef blackfin_isr ( *blackfin_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
diff --git a/cpukit/score/cpu/h8300/rtems/score/types.h b/cpukit/score/cpu/h8300/rtems/score/types.h
index 9299f1860d..8137edc120 100644
--- a/cpukit/score/cpu/h8300/rtems/score/types.h
+++ b/cpukit/score/cpu/h8300/rtems/score/types.h
@@ -33,15 +33,15 @@ extern "C" {
  */
 
 typedef uint16_t     Priority_Bit_map_control;
-
-typedef bool boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
 typedef void h8300_isr;
 typedef void ( *h8300_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
diff --git a/cpukit/score/cpu/i386/rtems/score/types.h b/cpukit/score/cpu/i386/rtems/score/types.h
index 663d98f93d..9934a0c552 100644
--- a/cpukit/score/cpu/i386/rtems/score/types.h
+++ b/cpukit/score/cpu/i386/rtems/score/types.h
@@ -33,16 +33,15 @@ extern "C" {
  */
 
 typedef uint16_t Priority_Bit_map_control;
-
-typedef bool boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
 typedef void i386_isr;
-
 typedef i386_isr ( *i386_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
diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/rtems/score/types.h
index 512f7e4b8c..3e7dee4161 100644
--- a/cpukit/score/cpu/m68k/rtems/score/types.h
+++ b/cpukit/score/cpu/m68k/rtems/score/types.h
@@ -33,16 +33,15 @@ extern "C" {
  */
 
 typedef uint16_t     Priority_Bit_map_control;
-
-typedef bool boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
 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
diff --git a/cpukit/score/cpu/mips/rtems/score/types.h b/cpukit/score/cpu/mips/rtems/score/types.h
index cca53236ce..b328de9f65 100644
--- a/cpukit/score/cpu/mips/rtems/score/types.h
+++ b/cpukit/score/cpu/mips/rtems/score/types.h
@@ -34,15 +34,15 @@ extern "C" {
  */
 
 typedef uint16_t     Priority_Bit_map_control;
-
-typedef bool boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
 typedef void mips_isr;
 typedef void ( *mips_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
diff --git a/cpukit/score/cpu/no_cpu/rtems/score/types.h b/cpukit/score/cpu/no_cpu/rtems/score/types.h
index 569962ea59..49115c440f 100644
--- a/cpukit/score/cpu/no_cpu/rtems/score/types.h
+++ b/cpukit/score/cpu/no_cpu/rtems/score/types.h
@@ -35,20 +35,18 @@ extern "C" {
 /** This defines the type for a priority bit map entry. */
 typedef uint16_t Priority_Bit_map_control;
 
-/** This defines the type for a Boolean value, */
-typedef bool boolean;     /* Boolean value   */
-
-/** This defines the type for a single precision float. */
-typedef float          single_precision;
-/** This defines the type for a double precision float. */
-typedef double         double_precision;
-
 /** This defines the return type for an ISR entry point. */
 typedef void no_cpu_isr;
 
 /** This defines the prototype for an ISR entry point. */
 typedef no_cpu_isr ( *no_cpu_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
diff --git a/cpukit/score/cpu/powerpc/rtems/score/types.h b/cpukit/score/cpu/powerpc/rtems/score/types.h
index 43a007e58a..d4bb74e501 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/types.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/types.h
@@ -48,16 +48,15 @@ extern "C" {
 /*
  *  This section defines the basic types for this processor.
  */
-
 typedef uint32_t     Priority_Bit_map_control;
-
-typedef bool boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
 typedef void ppc_isr;
 
+#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
diff --git a/cpukit/score/cpu/sh/rtems/score/types.h b/cpukit/score/cpu/sh/rtems/score/types.h
index a9ea64da39..9066fb7f72 100644
--- a/cpukit/score/cpu/sh/rtems/score/types.h
+++ b/cpukit/score/cpu/sh/rtems/score/types.h
@@ -44,14 +44,14 @@ extern "C" {
 
 typedef uint16_t     Priority_Bit_map_control;
 
-typedef bool boolean;	     			/* Boolean value, external */
-						/* data bus has 16 bits  */
+typedef void sh_isr;
+typedef void ( *sh_isr_entry )( void );
 
+#ifdef RTEMS_DEPRECATED_TYPES
+typedef bool boolean;	     			/* Boolean value, external */
 typedef float          single_precision;     	/* single precision float */
 typedef double         double_precision;     	/* double precision float */
-
-typedef void sh_isr;
-typedef void ( *sh_isr_entry )( void );
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/cpukit/score/cpu/sparc/rtems/score/types.h b/cpukit/score/cpu/sparc/rtems/score/types.h
index 3096a233a0..4fb9baebbb 100644
--- a/cpukit/score/cpu/sparc/rtems/score/types.h
+++ b/cpukit/score/cpu/sparc/rtems/score/types.h
@@ -33,15 +33,15 @@ extern "C" {
  */
 
 typedef uint16_t         Priority_Bit_map_control;
-
-typedef bool         boolean;              /* Boolean value   */
-
-typedef float              single_precision;     /* single precision float */
-typedef double             double_precision;     /* double precision float */
-
 typedef void sparc_isr;
 typedef void ( *sparc_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
diff --git a/cpukit/score/cpu/unix/rtems/score/types.h b/cpukit/score/cpu/unix/rtems/score/types.h
index bd678c68b9..bd7fcae2d2 100644
--- a/cpukit/score/cpu/unix/rtems/score/types.h
+++ b/cpukit/score/cpu/unix/rtems/score/types.h
@@ -40,18 +40,16 @@ extern "C" {
  *  This section defines the basic types for this processor.
  */
 
-
 typedef uint16_t     Priority_Bit_map_control;
-
-typedef bool boolean;     /* Boolean value   */
-
-typedef float          single_precision;     /* single precision float */
-typedef double         double_precision;     /* double precision float */
-
 typedef void unix_isr;
-
 typedef unix_isr ( *unix_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