diff options
Diffstat (limited to 'msgpack')
| -rw-r--r-- | msgpack/pack/inline_impl.h | 10 | ||||
| -rw-r--r-- | msgpack/unpack/inline_impl.h | 15 |
2 files changed, 13 insertions, 12 deletions
diff --git a/msgpack/pack/inline_impl.h b/msgpack/pack/inline_impl.h index d4d5a5a..635b697 100644 --- a/msgpack/pack/inline_impl.h +++ b/msgpack/pack/inline_impl.h @@ -52,7 +52,7 @@ #endif -#ifndef msgpack_pack_inline_func(name) +#ifndef msgpack_pack_inline_func #define msgpack_pack_inline_func(name) \ inline void msgpack_pack_##name #endif @@ -293,11 +293,11 @@ msgpack_pack_inline_func(raw)(msgpack_pack_context x, const void* b, size_t l) } -#undef msgpack_pack_inline_func(name) +#undef msgpack_pack_inline_func -#undef STORE_BE16(d) -#undef STORE_BE32(d) -#undef STORE_BE64(d) +#undef STORE_BE16 +#undef STORE_BE32 +#undef STORE_BE64 #endif /* msgpack/pack/inline_impl.h */ diff --git a/msgpack/unpack/inline_impl.h b/msgpack/unpack/inline_impl.h index 443a40c..a6557f9 100644 --- a/msgpack/unpack/inline_impl.h +++ b/msgpack/unpack/inline_impl.h @@ -175,6 +175,7 @@ int msgpack_unpacker_execute(msgpack_unpacker* ctx, const char* data, size_t len msgpack_unpack_context* user = &ctx->user; msgpack_object obj; + msgpack_unpacker_stack* c = NULL; int ret; @@ -381,7 +382,7 @@ int msgpack_unpacker_execute(msgpack_unpacker* ctx, const char* data, size_t len _push: if(top == 0) { goto _finish; } - msgpack_unpacker_stack* c = &stack[top-1]; + c = &stack[top-1]; switch(c->ct) { case CT_ARRAY_ITEM: msgpack_unpack_array_item(user, c->obj, obj); @@ -444,16 +445,16 @@ _end: } -#ifdef betoh16(x) -#undef betoh16(x) +#ifdef betoh16 +#undef betoh16 #endif -#ifdef betoh32(x) -#undef betoh32(x) +#ifdef betoh32 +#undef betoh32 #endif -#ifdef betoh64(x) -#undef betoh64(x) +#ifdef betoh64 +#undef betoh64 #endif #ifdef __cplusplus |