fixes Visual C++ compatibility

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
+

c/msgpack/zone.h

@@ -19,8 +19,6 @@
 #define MSGPACK_ZONE_H__
 
 #include "msgpack/sysdep.h"
-#include <stddef.h>
-#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {

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; 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; }

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;
 

configure.in

@@ -1,6 +1,6 @@
 AC_INIT(msgpack/unpack_template.h)
 AC_CONFIG_AUX_DIR(ac)
-AM_INIT_AUTOMAKE(msgpack, 0.4.1)
+AM_INIT_AUTOMAKE(msgpack, 0.4.3)
 AC_CONFIG_HEADER(config.h)
 
 AC_SUBST(CFLAGS)

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\
+

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

msgpack_vc8.vcproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="shift_jis"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -27,6 +27,9 @@
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Description="Gathering header files"
+				CommandLine="msgpack_vc8.postbuild.bat"
+				Outputs="include"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -61,6 +64,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="lib\$(ProjectName)d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -91,6 +95,9 @@
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Description="Gathering header files"
+				CommandLine="msgpack_vc8.postbuild.bat"
+				Outputs="include"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -122,6 +129,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
+				OutputFile="lib\$(ProjectName).lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -144,7 +152,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="<EFBFBD>\<5C>[<5B>X <20>t<EFBFBD>@<40>C<EFBFBD><43>"
+			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
@@ -238,7 +246,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="<EFBFBD>w<EFBFBD>b<EFBFBD>_<EFBFBD>[ <20>t<EFBFBD>@<40>C<EFBFBD><43>"
+			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
@@ -264,7 +272,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="<EFBFBD><EFBFBD><EFBFBD>\<5C>[<5B>X <20>t<EFBFBD>@<40>C<EFBFBD><43>"
+			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>

ruby/makegem.sh

@@ -19,3 +19,8 @@ cat msgpack_test.rb | sed "s/require ['\"]msgpack['\"]/require File.dirname(__FI
 
 gem build msgpack.gemspec
 
+# ./msgpack.mingw.sh  # on msys
+# gem push msgpack-$version.gem
+# gem push msgpack-$version-x86-mingw32.gem
+# gem push msgpack-$version-mswin32.gem
+

ruby/msgpack.mingw.gemspec

@@ -0,0 +1,16 @@
+Gem::Specification.new do |s|
+  s.platform = Gem::Platform::CURRENT
+  s.name = "msgpack"
+  s.version = "0.3.3"
+  s.summary = "MessagePack, a binary-based efficient data interchange format."
+  s.author = "FURUHASHI Sadayuki"
+  s.email = "frsyuki@users.sourceforge.jp"
+  s.homepage = "http://msgpack.sourceforge.jp/"
+  s.rubyforge_project = "msgpack"
+  s.has_rdoc = false
+  s.extra_rdoc_files = ["README", "ChangeLog", "AUTHORS"]
+  s.require_paths = ["lib", "ext"]
+  s.files = Dir["lib/**/*", "ext/**/*", "msgpack/**/*", "test/**/*"]
+  s.test_files = Dir["test/test_*.rb"]
+  s.extensions = Dir["ext/**/extconf.rb"]
+end

ruby/msgpack.mingw.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+if [ -z "$1" ];then
+	echo "usage: $0 <version>"
+	exit 1
+fi
+
+version=$1
+build=msgpack-mingw-build
+
+./makegem.sh
+gem build msgpack.mingw.gemspec
+rm -rf $build
+mkdir $build
+cd $build
+tar xvf ../msgpack-$version-x86-mingw32.gem
+gunzip metadata.gz
+sed s/x86-mingw32/mswin32/ metadata > metadata.tmp
+mv metadata.tmp metadata
+gzip metadata
+tar cvf msgpack-$version-mswin32.gem metadata.gz data.tar.gz
+