Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Publishing nanopb-0.2.9
[apps/agl-service-can-low-level.git]
/
pb.h
diff --git
a/pb.h
b/pb.h
index
6f84385
..
210aa9f
100644
(file)
--- 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. */
/* Version of the nanopb library. Just in case you want to check it in
* your own program. */
-#define NANOPB_VERSION nanopb-0.2.
7-dev
+#define NANOPB_VERSION nanopb-0.2.
9
/* Include all the system headers needed by nanopb. You will need the
* definitions of the following:
/* 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))
# 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
# define PB_PACKED_STRUCT_START _Pragma("pack(push, 1)")
# define PB_PACKED_STRUCT_END _Pragma("pack(pop)")
# define pb_packed
@@
-341,6
+341,10
@@
struct _pb_extension_t {
* If this extension does not match a field, the next handler is
* automatically called. */
pb_extension_t *next;
* If this extension does not match a field, the next handler is
* automatically called. */
pb_extension_t *next;
+
+ /* The decoder sets this to true if the extension was found.
+ * Ignored for encoding. */
+ bool found;
};
/* Memory allocation functions to use. You can define pb_realloc and
};
/* Memory allocation functions to use. You can define pb_realloc and
@@
-496,7
+500,11
@@
struct _pb_extension_t {
* messages if not used.
*/
#ifdef PB_NO_ERRMSG
* messages if not used.
*/
#ifdef PB_NO_ERRMSG
-#define PB_RETURN_ERROR(stream,msg) return false
+#define PB_RETURN_ERROR(stream,msg) \
+ do {\
+ UNUSED(stream); \
+ return false; \
+ } while(0)
#define PB_GET_ERROR(stream) "(errmsg disabled)"
#else
#define PB_RETURN_ERROR(stream,msg) \
#define PB_GET_ERROR(stream) "(errmsg disabled)"
#else
#define PB_RETURN_ERROR(stream,msg) \