X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=pb.h;h=210aa9fdd44531e013566b2e9dabb2267c04a611;hb=2f05a35b5f5ce28650db096d61d7793ee982d073;hp=258ec925dfdf5130f210cc66a80564ba52f198de;hpb=916bcb3643b257ab2cb2cbc6a74da2c0cb74d275;p=apps%2Fagl-service-can-low-level.git

diff --git a/pb.h b/pb.h
index 258ec925..210aa9fd 100644
--- a/pb.h
+++ b/pb.h
@@ -46,7 +46,7 @@
 
 /* Version of the nanopb library. Just in case you want to check it in
  * your own program. */
-#define NANOPB_VERSION nanopb-0.2.8
+#define NANOPB_VERSION nanopb-0.2.9
 
 /* Include all the system headers needed by nanopb. You will need the
  * definitions of the following:
@@ -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