generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-20 22:31:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:msgpack/msgpack

Browse Source
This commit is contained in:
frsyuki
2011-04-17 06:49:36 +09:00
parent 6a9f3ae71d c58ce1a975
commit 8446549ed8
141 changed files with 22146 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpp/ChangeLog
View File

@@ -1,4 +1,10 @@
2011-02-24 version 0.5.5:
* eliminates dependency of winsock2.h header
* fixes msgpack_vc.postbuild.bat file
* fixes some implicit cast warnings
2010-08-29 version 0.5.4:
* includes msgpack_vc2008.vcproj file in source package

2
cpp/configure.in
View File

@@ -1,6 +1,6 @@
AC_INIT(src/object.cpp)
AC_CONFIG_AUX_DIR(ac)
AM_INIT_AUTOMAKE(msgpack, 0.5.4)
AM_INIT_AUTOMAKE(msgpack, 0.5.5)
AC_CONFIG_HEADER(config.h)
AC_SUBST(CFLAGS)

2
cpp/preprocess
View File

@@ -12,7 +12,7 @@ preprocess() {
fi
}
if [ "$1" == "clean" ];then
if [ "$1" = "clean" ];then
rm -f src/msgpack/type/tuple.hpp
rm -f src/msgpack/type/define.hpp
rm -f src/msgpack/zone.hpp

3
cpp/src/msgpack/pack.h
View File

@@ -105,9 +105,6 @@ int msgpack_pack_object(msgpack_packer* pk, msgpack_object d);
#define msgpack_pack_inline_func_cint(name) \
inline int msgpack_pack ## name
#define msgpack_pack_inline_func_cint(name) \
inline int msgpack_pack ## name
#define msgpack_pack_inline_func_fixint(name) \
inline int msgpack_pack_fix ## name

2
cpp/test/Makefile.am
View File

@@ -1,7 +1,7 @@
AM_CPPFLAGS = -I../src
AM_C_CPPFLAGS = -I../src
AM_LDFLAGS = ../src/libmsgpack.la -lgtest_main
AM_LDFLAGS = ../src/libmsgpack.la -lgtest_main -pthread
check_PROGRAMS = \
zone \