generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-04-26 18:11:30 +02:00
Code Issues Projects Releases Wiki Activity

lang/c/msgpack: fixed packaging problem

Browse Source 
git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@64 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
This commit is contained in:
frsyuki 2009-02-15 09:09:57 +00:00
parent 1278eb3c63
commit 48e0274505
10 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c/configure.in
View File

@ -1,4 +1,4 @@
AC_INIT(pack.h) AC_INIT(pack.c)
AM_INIT_AUTOMAKE(msgpackc, 0.1.0) AM_INIT_AUTOMAKE(msgpackc, 0.1.0)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)

2
c/pack_inline.h
View File

@ -18,7 +18,7 @@
#ifndef PACK_INLINE_H__ #ifndef PACK_INLINE_H__
#define PACK_INLINE_H__ #define PACK_INLINE_H__
#include "pack.h" #include "msgpack/pack.h"
typedef msgpack_pack_t* msgpack_pack_context; typedef msgpack_pack_t* msgpack_pack_context;

2
c/unpack.c
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include "unpack.h" #include "msgpack/unpack.h"
#include "unpack_context.h" #include "unpack_context.h"
#include <stdlib.h> #include <stdlib.h>

2
c/unpack_context.h
View File

@ -18,7 +18,7 @@
#ifndef UNPACK_CONTEXT_H__ #ifndef UNPACK_CONTEXT_H__
#define UNPACK_CONTEXT_H__ #define UNPACK_CONTEXT_H__
#include "unpack.h" #include "msgpack/unpack.h"
typedef void* msgpack_object; typedef void* msgpack_object;

3
cpp/Makefile.am
View File

@ -14,7 +14,8 @@ nobase_include_HEADERS = \
msgpack/zone.hpp msgpack/zone.hpp
noinst_HEADERS = \ noinst_HEADERS = \
unpack_context.hpp unpack_context.hpp \
msgpack/zone.hpp.erb
msgpack/zone.hpp: msgpack/zone.hpp.erb msgpack/zone.hpp: msgpack/zone.hpp.erb
erb $< > $@ erb $< > $@

2
cpp/configure.in
View File

@ -1,4 +1,4 @@
AC_INIT(object.hpp) AC_INIT(object.cpp)
AM_INIT_AUTOMAKE(msgpack, 0.1.0) AM_INIT_AUTOMAKE(msgpack, 0.1.0)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)

6
cpp/object.hpp
View File

@ -232,7 +232,7 @@ INTEGER_CLASS(int16_t, i16)
INTEGER_CLASS(int32_t, i32) INTEGER_CLASS(int32_t, i32)
INTEGER_CLASS(int64_t, i64) INTEGER_CLASS(int64_t, i64)
#undef INTEGER_CLASS(TYPE, NAME) #undef INTEGER_CLASS
#define FLOAT_CLASS(TYPE, NAME) \ #define FLOAT_CLASS(TYPE, NAME) \
@ -260,7 +260,7 @@ private: \
FLOAT_CLASS(float, float) FLOAT_CLASS(float, float)
FLOAT_CLASS(double, double) FLOAT_CLASS(double, double)
#undef FLOAT_CLASS(TYPE, NAME) #undef FLOAT_CLASS
#define RAW_CLASS(NAME, TYPE, EXTRA) \ #define RAW_CLASS(NAME, TYPE, EXTRA) \
@ -281,7 +281,7 @@ private: \
RAW_CLASS(mutable_raw_ref, char*, /*mutable_raw xraw();*/ raw xraw() const; ) RAW_CLASS(mutable_raw_ref, char*, /*mutable_raw xraw();*/ raw xraw() const; )
RAW_CLASS(raw_ref, const char*, raw xraw() const; ) RAW_CLASS(raw_ref, const char*, raw xraw() const; )
#undef RAW_CLASS(NAME, TYPE, EXTRA) #undef RAW_CLASS
struct object_array : object_class, object_container_mixin { struct object_array : object_class, object_container_mixin {

2
cpp/zone.cpp
View File

@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#include "zone.hpp" #include "msgpack/zone.hpp"
namespace msgpack { namespace msgpack {

10
msgpack/pack/inline_impl.h
View File

@ -52,7 +52,7 @@
#endif #endif
#ifndef msgpack_pack_inline_func(name) #ifndef msgpack_pack_inline_func
#define msgpack_pack_inline_func(name) \ #define msgpack_pack_inline_func(name) \
inline void msgpack_pack_##name inline void msgpack_pack_##name
#endif #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_BE16
#undef STORE_BE32(d) #undef STORE_BE32
#undef STORE_BE64(d) #undef STORE_BE64
#endif /* msgpack/pack/inline_impl.h */ #endif /* msgpack/pack/inline_impl.h */

15
msgpack/unpack/inline_impl.h
View File

@ -175,6 +175,7 @@ int msgpack_unpacker_execute(msgpack_unpacker* ctx, const char* data, size_t len
msgpack_unpack_context* user = &ctx->user; msgpack_unpack_context* user = &ctx->user;
msgpack_object obj; msgpack_object obj;
msgpack_unpacker_stack* c = NULL;
int ret; int ret;
@ -381,7 +382,7 @@ int msgpack_unpacker_execute(msgpack_unpacker* ctx, const char* data, size_t len
_push: _push:
if(top == 0) { goto _finish; } if(top == 0) { goto _finish; }
msgpack_unpacker_stack* c = &stack[top-1]; c = &stack[top-1];
switch(c->ct) { switch(c->ct) {
case CT_ARRAY_ITEM: case CT_ARRAY_ITEM:
msgpack_unpack_array_item(user, c->obj, obj); msgpack_unpack_array_item(user, c->obj, obj);
@ -444,16 +445,16 @@ _end:
} }
#ifdef betoh16(x) #ifdef betoh16
#undef betoh16(x) #undef betoh16
#endif #endif
#ifdef betoh32(x) #ifdef betoh32
#undef betoh32(x) #undef betoh32
#endif #endif
#ifdef betoh64(x) #ifdef betoh64
#undef betoh64(x) #undef betoh64
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus