diff options
| author | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2014-05-30 14:45:48 +0400 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2014-05-30 14:45:48 +0400 |
| commit | 8611958a7f5ec16261cbacaf62a0ea92fd9dd314 (patch) | |
| tree | a7163c0f3c9ce4e9c30133b82e8e2d796d60cb57 /pb.h | |
| parent | 2e9797af5820c41645c98c4d156ae24961835d4e (diff) | |
Add PB_PACKED_STRUCT support for Keil MDK-ARM toolchain
Patch from Jon Read.
Update issue 119
Status: FixedInGit
Diffstat (limited to 'pb.h')
| -rw-r--r-- | pb.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -80,8 +80,8 @@ # define PB_PACKED_STRUCT_START # define PB_PACKED_STRUCT_END # define pb_packed __attribute__((packed)) -#elif defined(__ICCARM__) - /* For IAR ARM compiler */ +#elif defined(__ICCARM__) || defined(__CC_ARM) + /* For IAR ARM and Keil MDK-ARM compilers */ # define PB_PACKED_STRUCT_START _Pragma("pack(push, 1)") # define PB_PACKED_STRUCT_END _Pragma("pack(pop)") # define pb_packed |