From 568704ed2256047fbf69657b5cc1e02f76e71855 Mon Sep 17 00:00:00 2001 From: frsyuki Date: Fri, 19 Mar 2010 13:34:53 +0900 Subject: [PATCH] fixes Visual C++ compatibility --- Makefile.am | 5 + c/msgpack/zone.h | 2 - c/unpack.c | 2 +- c/vrefbuffer.c | 1 - configure.in | 2 +- msgpack_vc8.postbuild.bat | 41 +++ msgpack_vc8.sln | 20 ++ msgpack_vc8.vcproj | 558 +++++++++++++++++++------------------- 8 files changed, 351 insertions(+), 280 deletions(-) create mode 100644 msgpack_vc8.postbuild.bat create mode 100644 msgpack_vc8.sln mode change 100644 => 100755 msgpack_vc8.vcproj diff --git a/Makefile.am b/Makefile.am index 42fb2335..04f62d2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,3 +11,8 @@ nobase_include_HEADERS = \ msgpack/unpack_template.h \ msgpack/sysdep.h +EXTRA_DIST = \ + msgpack_vc8.vcproj \ + msgpack_vc8.sln \ + msgpack_vc8.postbuild.bat + diff --git a/c/msgpack/zone.h b/c/msgpack/zone.h index 475ae514..ce5be6d8 100644 --- a/c/msgpack/zone.h +++ b/c/msgpack/zone.h @@ -19,8 +19,6 @@ #define MSGPACK_ZONE_H__ #include "msgpack/sysdep.h" -#include -#include #ifdef __cplusplus extern "C" { diff --git a/c/unpack.c b/c/unpack.c index 140ad1f1..8be0b921 100644 --- a/c/unpack.c +++ b/c/unpack.c @@ -52,7 +52,7 @@ static int template_execute(template_context* ctx, static inline msgpack_object template_callback_root(unpack_user* u) -{ msgpack_object o = {0}; return o; } +{ msgpack_object o = {}; return o; } static inline int template_callback_uint8(unpack_user* u, uint8_t d, msgpack_object* o) { o->type = MSGPACK_OBJECT_POSITIVE_INTEGER; o->via.u64 = d; return 0; } diff --git a/c/vrefbuffer.c b/c/vrefbuffer.c index b528874d..136372f6 100644 --- a/c/vrefbuffer.c +++ b/c/vrefbuffer.c @@ -30,7 +30,6 @@ bool msgpack_vrefbuffer_init(msgpack_vrefbuffer* vbuf, vbuf->chunk_size = chunk_size; vbuf->ref_size = ref_size; - // glibcは72バイト以下のmallocが高速 size_t nfirst = (sizeof(struct iovec) < 72/2) ? 72 / sizeof(struct iovec) : 8; diff --git a/configure.in b/configure.in index c75957b2..0f2c5d0f 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(msgpack/unpack_template.h) AC_CONFIG_AUX_DIR(ac) -AM_INIT_AUTOMAKE(msgpack, 0.4.2) +AM_INIT_AUTOMAKE(msgpack, 0.4.3) AC_CONFIG_HEADER(config.h) AC_SUBST(CFLAGS) diff --git a/msgpack_vc8.postbuild.bat b/msgpack_vc8.postbuild.bat new file mode 100644 index 00000000..7ee25866 --- /dev/null +++ b/msgpack_vc8.postbuild.bat @@ -0,0 +1,41 @@ +IF NOT EXIST include MKDIR include +IF NOT EXIST include\msgpack MKDIR include\msgpack +IF NOT EXIST include\msgpack\type MKDIR include\msgpack\type +IF NOT EXIST include\msgpack\type\tr1 MKDIR include\msgpack\type\tr1 +copy msgpack\pack_define.h include\msgpack\ +copy msgpack\pack_template.h include\msgpack\ +copy msgpack\unpack_define.h include\msgpack\ +copy msgpack\unpack_template.h include\msgpack\ +copy msgpack\sysdep.h include\msgpack\ +copy c\msgpack.h include\ +copy c\msgpack\sbuffer.h include\msgpack\ +copy c\msgpack\vrefbuffer.h include\msgpack\ +copy c\msgpack\pack.h include\msgpack\ +copy c\msgpack\unpack.h include\msgpack\ +copy c\msgpack\object.h include\msgpack\ +copy c\msgpack\zone.h include\msgpack\ +copy cpp\msgpack.hpp include\ +copy cpp\msgpack\sbuffer.hpp include\msgpack\ +copy cpp\msgpack\vrefbuffer.hpp include\msgpack\ +copy cpp\msgpack\pack.hpp include\msgpack\ +copy cpp\msgpack\unpack.hpp include\msgpack\ +copy cpp\msgpack\object.hpp include\msgpack\ +copy cpp\msgpack\zone.hpp include\msgpack\ +copy cpp\msgpack\type.hpp include\msgpack\type\ +copy cpp\msgpack\type\bool.hpp include\msgpack\type\ +copy cpp\msgpack\type\float.hpp include\msgpack\type\ +copy cpp\msgpack\type\int.hpp include\msgpack\type\ +copy cpp\msgpack\type\list.hpp include\msgpack\type\ +copy cpp\msgpack\type\deque.hpp include\msgpack\type\ +copy cpp\msgpack\type\map.hpp include\msgpack\type\ +copy cpp\msgpack\type\nil.hpp include\msgpack\type\ +copy cpp\msgpack\type\pair.hpp include\msgpack\type\ +copy cpp\msgpack\type\raw.hpp include\msgpack\type\ +copy cpp\msgpack\type\set.hpp include\msgpack\type\ +copy cpp\msgpack\type\string.hpp include\msgpack\type\ +copy cpp\msgpack\type\vector.hpp include\msgpack\type\ +copy cpp\msgpack\type\tuple.hpp include\msgpack\type\ +copy cpp\msgpack\type\define.hpp include\msgpack\type\ +copy cpp\msgpack\type\tr1\unordered_map.hpp include\msgpack\type\ +copy cpp\msgpack\type\tr1\unordered_set.hpp include\msgpack\type\ + diff --git a/msgpack_vc8.sln b/msgpack_vc8.sln new file mode 100644 index 00000000..84718afa --- /dev/null +++ b/msgpack_vc8.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MessagePack", "msgpack_vc8.vcproj", "{122A2EA4-B283-4241-9655-786DE78283B2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {122A2EA4-B283-4241-9655-786DE78283B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {122A2EA4-B283-4241-9655-786DE78283B2}.Debug|Win32.Build.0 = Debug|Win32 + {122A2EA4-B283-4241-9655-786DE78283B2}.Release|Win32.ActiveCfg = Release|Win32 + {122A2EA4-B283-4241-9655-786DE78283B2}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/msgpack_vc8.vcproj b/msgpack_vc8.vcproj old mode 100644 new mode 100755 index 5daec015..a3fa28fb --- a/msgpack_vc8.vcproj +++ b/msgpack_vc8.vcproj @@ -1,275 +1,283 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +