From 48274706a752efcee061f628a85964fda895ff57 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 29 Jun 2015 10:41:01 +0200 Subject: score: Rename struct Thread_Control Add a leading underscore to the structure name to allow forward declarations in standard header files provided by Newlib and GCC. --- cpukit/score/include/rtems/score/percpu.h | 10 +++++----- cpukit/score/include/rtems/score/thread.h | 5 ++++- cpukit/score/include/rtems/score/threadq.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h index 9ce68ef7b1..f1dad90ccc 100644 --- a/cpukit/score/include/rtems/score/percpu.h +++ b/cpukit/score/include/rtems/score/percpu.h @@ -51,7 +51,7 @@ extern "C" { #if !defined( ASM ) -struct Thread_Control; +struct _Thread_Control; struct Scheduler_Context; @@ -273,7 +273,7 @@ typedef struct Per_CPU_Control { * configurations use _Thread_Is_executing_on_a_processor() to figure out if * a thread context is executing on a processor. */ - struct Thread_Control *executing; + struct _Thread_Control *executing; /** * @brief This is the heir thread for this processor. @@ -287,7 +287,7 @@ typedef struct Per_CPU_Control { * * @see _Thread_Get_heir_and_make_it_executing(). */ - struct Thread_Control *heir; + struct _Thread_Control *heir; /** * @brief This is set to true when this processor needs to run the @@ -609,9 +609,9 @@ bool _Per_CPU_State_wait_for_non_initial_state( * * @return The thread control block of the executing thread. */ -RTEMS_INLINE_ROUTINE struct Thread_Control *_Thread_Get_executing( void ) +RTEMS_INLINE_ROUTINE struct _Thread_Control *_Thread_Get_executing( void ) { - struct Thread_Control *executing; + struct _Thread_Control *executing; #if defined( RTEMS_SMP ) ISR_Level level; diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index 2f0b35e1a8..157acfa324 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -669,8 +669,11 @@ typedef struct { /** * This structure defines the Thread Control Block (TCB). + * + * Uses a leading underscore in the structure name to allow forward + * declarations in standard header files provided by Newlib and GCC. */ -struct Thread_Control { +struct _Thread_Control { /** This field is the object management structure for each thread. */ Objects_Control Object; /** This field is the current execution state of this thread. */ diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h index e3aee5869a..70b5ad6c11 100644 --- a/cpukit/score/include/rtems/score/threadq.h +++ b/cpukit/score/include/rtems/score/threadq.h @@ -39,7 +39,7 @@ extern "C" { */ /**@{*/ -typedef struct Thread_Control Thread_Control; +typedef struct _Thread_Control Thread_Control; typedef struct { /** This union contains the data structures used to manage the blocked -- cgit v1.2.3