From 9e5cc1159a47f6978f1fdbface3c03914875fcdb Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Tue, 6 Jul 2010 13:25:39 +0200 Subject: gcc: patch *.txt data files, with minimum impact on sources gcc do not allow to store a structure containing a flexible array member in an array. Also, sizeof (s), with s a structure containing a flexible array member will return the offset of the flexible array member, not the actual size. This patch handle those problems with minimum impact on sources. --- AT91SAM7S256/Source/Functions.inl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'AT91SAM7S256/Source/Functions.inl') diff --git a/AT91SAM7S256/Source/Functions.inl b/AT91SAM7S256/Source/Functions.inl index 4211137..1ef019e 100644 --- a/AT91SAM7S256/Source/Functions.inl +++ b/AT91SAM7S256/Source/Functions.inl @@ -1128,7 +1128,7 @@ UBYTE cUiVolume(UBYTE Action) // MENU_INIT,MENU_LEFT,MENU_RIGHT,MENU_EXIT VarsUi.Counter = VarsUi.NVData.VolumeStep + 1; VarsUi.pTmp = (UBYTE*)Cursor; - for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)sizeof(Cursor));VarsUi.Tmp++) + for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)SIZEOF_DATA(Cursor));VarsUi.Tmp++) { VarsUi.CursorTmp[VarsUi.Tmp] = *VarsUi.pTmp; VarsUi.pTmp++; @@ -2090,7 +2090,7 @@ UBYTE cUiOnBrickProgramming(UBYTE Action) // On brick programming pMapDisplay->EraseMask |= SCREEN_BIT(SCREEN_LARGE); VarsUi.pTmp = (UBYTE*)Cursor; - for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)sizeof(Cursor));VarsUi.Tmp++) + for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)SIZEOF_DATA(Cursor));VarsUi.Tmp++) { VarsUi.CursorTmp[VarsUi.Tmp] = *VarsUi.pTmp; VarsUi.pTmp++; @@ -2130,7 +2130,7 @@ UBYTE cUiOnBrickProgramming(UBYTE Action) // On brick programming case 0 : { VarsUi.pTmp = (UBYTE*)Cursor; - for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)sizeof(Cursor));VarsUi.Tmp++) + for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)SIZEOF_DATA(Cursor));VarsUi.Tmp++) { VarsUi.CursorTmp[VarsUi.Tmp] = *VarsUi.pTmp; VarsUi.pTmp++; @@ -3966,7 +3966,7 @@ UBYTE cUiPowerOffTime(UBYTE Action) // MENU_INIT,MENU_LEFT,MENU_RIGHT,MENU_E VarsUi.Counter = VarsUi.NVData.PowerdownCode + 1; VarsUi.pTmp = (UBYTE*)Cursor; - for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)sizeof(Cursor));VarsUi.Tmp++) + for (VarsUi.Tmp = 0;(VarsUi.Tmp < SIZE_OF_CURSOR) && (VarsUi.Tmp < (UBYTE)SIZEOF_DATA(Cursor));VarsUi.Tmp++) { VarsUi.CursorTmp[VarsUi.Tmp] = *VarsUi.pTmp; VarsUi.pTmp++; -- cgit v1.2.3