From 8611958a7f5ec16261cbacaf62a0ea92fd9dd314 Mon Sep 17 00:00:00 2001 From: Petteri Aimonen Date: Fri, 30 May 2014 13:45:48 +0300 Subject: [PATCH] Add PB_PACKED_STRUCT support for Keil MDK-ARM toolchain Patch from Jon Read. Update issue 119 Status: FixedInGit --- pb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pb.h b/pb.h index c66375df..2c1851be 100644 --- a/pb.h +++ b/pb.h @@ -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 -- 2.16.6