score: Simplify CORE_message_queue_Buffer

Merge CORE_message_queue_Buffer structure into
CORE_message_queue_Buffer_control.

Use a zero-length array for the actual message buffer.  This reduces the
structure size on all targets.

Update #4007.

1 files changed, 10 insertions, 10 deletions

diff --git a/cpukit/score/src/coremsginsert.c b/cpukit/score/src/coremsginsert.c
index 850e1cd457..1a2abc3c96 100644
--- a/cpukit/score/src/coremsginsert.c
+++ b/cpukit/score/src/coremsginsert.c
@@ -27,11 +27,11 @@ static bool _CORE_message_queue_Order(
   const Chain_Node *right
 )
 {
-   const int                               *left_priority;
-   const CORE_message_queue_Buffer_control *right_message;
+   const int                       *left_priority;
+   const CORE_message_queue_Buffer *right_message;
 
    left_priority = (const int *) left;
-   right_message = (const CORE_message_queue_Buffer_control *) right;
+   right_message = (const CORE_message_queue_Buffer *) right;
 
    return *left_priority <
      _CORE_message_queue_Get_message_priority( right_message );
@@ -39,20 +39,20 @@ static bool _CORE_message_queue_Order(
 #endif
 
 void _CORE_message_queue_Insert_message(
-  CORE_message_queue_Control        *the_message_queue,
-  CORE_message_queue_Buffer_control *the_message,
-  const void                        *content_source,
-  size_t                             content_size,
-  CORE_message_queue_Submit_types    submit_type
+  CORE_message_queue_Control      *the_message_queue,
+  CORE_message_queue_Buffer       *the_message,
+  const void                      *content_source,
+  size_t                           content_size,
+  CORE_message_queue_Submit_types  submit_type
 )
 {
   Chain_Control *pending_messages;
 
-  the_message->Contents.size = content_size;
+  the_message->size = content_size;
 
   _CORE_message_queue_Copy_buffer(
     content_source,
-    the_message->Contents.buffer,
+    the_message->buffer,
     content_size
   );