Index: App/Services/SystemCommMessages.c
===================================================================
diff -u -rcda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd -r0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00
--- App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cda7aca3cdae3f3a2c2bcefc009f96a9bf6e4bdd)
+++ App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0e1748b0cdc3df627c5f7cf685ff0f4c7bc63d00)
@@ -267,7 +267,7 @@
     BOOL result;
 
     // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
+    if ( SIZE_OF_TEST_OVERRIDE_CARGO_T == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
 
@@ -300,7 +300,7 @@
     BOOL result;
 
     // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
+    if ( SIZE_OF_TEST_OVERRIDE_CARGO_T == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
 
@@ -333,7 +333,7 @@
     BOOL result;
 
     // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
+    if ( SIZE_OF_TEST_OVERRIDE_CARGO_T == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
 
@@ -366,7 +366,7 @@
     BOOL result;
 
     // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) == message->hdr.cargoLen )
+    if ( SIZE_OF_TEST_OVERRIDE_ARRAY_CARGO_T == message->hdr.cargoLen )
     {
         memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) );