Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update usage of uint64_t according to C90 standard #907

Merged
merged 2 commits into from
Jun 12, 2023
+6 −9
Merged

Update usage of uint64_t according to C90 standard #907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27168fc
Update according to C90 standard
moninom1 Jun 8, 2023
455c18c
Merge branch 'main' into new
kar-rahul-aws Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions source/include/FreeRTOS_IP_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,15 +536,15 @@ BaseType_t xIPIsNetworkTaskReady( void );
{
struct
{
uint64_t ullAlignmentWord; /**< Increase the alignment of this union by adding a 64-bit variable. */
uint32_t ullAlignmentWord; /**< Increase the alignment of this union by adding a 32-bit variable. */
} a; /**< A struct to increase alignment. */
struct
{
/* The next field only serves to give 'ucLastPacket' a correct
* alignment of 8 + 2. See comments in FreeRTOS_IP.h */
* alignment of 4 + 2. See comments in FreeRTOS_IP.h */
uint8_t ucFillPacket[ ipconfigPACKET_FILLER_SIZE ];
uint8_t ucLastPacket[ sizeof( TCPPacket_t ) ];
} u; /**< The structure to give an alignment of 8 + 2 */
} u; /**< The structure to give an alignment of 4 + 2 */
} LastTCPPacket_t;

/**
Expand Down Expand Up @@ -709,14 +709,11 @@ typedef struct xSOCKET

union
{
IPUDPSocket_t xUDP; /**< Union member: UDP socket*/
IPUDPSocket_t xUDP; /**< Union member: UDP socket*/
#if ( ipconfigUSE_TCP == 1 )
IPTCPSocket_t xTCP; /**< Union member: TCP socket */

uint64_t ullTCPAlignment; /**< Make sure that xTCP is 8-bytes aligned by
* declaring a 64-bit variable in the same union */
IPTCPSocket_t xTCP; /**< Union member: TCP socket */
#endif /* ipconfigUSE_TCP */
} u; /**< Union of TCP/UDP socket */
} u; /**< Union of TCP/UDP socket */
} FreeRTOS_Socket_t;

#if ( ipconfigUSE_TCP == 1 )
Expand Down