diff --git a/cmd/tools/bcomps.vcxproj b/cmd/tools/bcomps.vcxproj
index 285907336435f88aa016f10e02a2dc7b245cf7d8..a1a1e65a72bb1fc78facffc17a43f90f07828a86 100644
--- a/cmd/tools/bcomps.vcxproj
+++ b/cmd/tools/bcomps.vcxproj
@@ -40,13 +40,13 @@
$(SolutionDir)Debug\Graphviz\bin\
- Debug\
+ Debug\$(ProjectName)\
C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset
true
$(SolutionDir)Graphviz\bin\
- Release\
+ Release\$(ProjectName)\
AllRules.ruleset
true
diff --git a/cmd/tools/gvpack.vcxproj b/cmd/tools/gvpack.vcxproj
index 5648e07177edbf6bed5547a5464bb5100c314918..1c103e249e737df784ba5a4a418ceaaee4f0c613 100644
--- a/cmd/tools/gvpack.vcxproj
+++ b/cmd/tools/gvpack.vcxproj
@@ -40,13 +40,13 @@
$(SolutionDir)Debug\Graphviz\bin\
- Debug\
+ Debug\$(ProjectName)\
C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset
true
$(SolutionDir)Graphviz\bin\
- Release\
+ Release\$(ProjectName)\
AllRules.ruleset
true
diff --git a/cmd/tools/mm2gv.vcxproj b/cmd/tools/mm2gv.vcxproj
index 75df515a052298587a7ef7927cede8d177b0e8b5..0121760068dea9162c9caef815d34bc5b5d1b3b2 100644
--- a/cmd/tools/mm2gv.vcxproj
+++ b/cmd/tools/mm2gv.vcxproj
@@ -40,14 +40,14 @@
$(SolutionDir)Debug\Graphviz\bin\
- Debug\
+ Debug\$(ProjectName)\
true
C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset
true
$(SolutionDir)Graphviz\bin\
- Release\
+ Release\$(ProjectName)\
true
AllRules.ruleset
true
diff --git a/cmd/tools/sccmap.vcxproj b/cmd/tools/sccmap.vcxproj
index 81a282a6bd662ba761f2638e467142be45706434..7947cf34b5ab98886fc71495f568b3aef68655c4 100644
--- a/cmd/tools/sccmap.vcxproj
+++ b/cmd/tools/sccmap.vcxproj
@@ -40,14 +40,14 @@
$(SolutionDir)Debug\Graphviz\bin\
- Debug\
+ Debug\$(ProjectName)\
true
C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset
true
$(SolutionDir)Graphviz\bin\
- Release\
+ Release\$(ProjectName)\
true
AllRules.ruleset
true
diff --git a/cmd/tools/tred.vcxproj b/cmd/tools/tred.vcxproj
index 953dda38b5f65356ce4bcd688c7403ee241c718c..e53f252da920d3f605bd25d64e8060c01cc1f951 100644
--- a/cmd/tools/tred.vcxproj
+++ b/cmd/tools/tred.vcxproj
@@ -40,14 +40,14 @@
$(SolutionDir)Debug\Graphviz\bin\
- Debug\
+ Debug\$(ProjectName)\
true
C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset
true
$(SolutionDir)Graphviz\bin\
- Release\
+ Release\$(ProjectName)\
true
AllRules.ruleset
true
diff --git a/cmd/tools/unflatten.vcxproj b/cmd/tools/unflatten.vcxproj
index e19b783b961a6681810b14d137ab38158469eb57..2998ebe8d97ce6878e30c6b118ebb7ccf5417199 100644
--- a/cmd/tools/unflatten.vcxproj
+++ b/cmd/tools/unflatten.vcxproj
@@ -40,13 +40,13 @@
$(SolutionDir)Debug\Graphviz\bin\
- Debug\
+ Debug\$(ProjectName)\
C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset
true
$(SolutionDir)Graphviz\bin\
- Release\
+ Release\$(ProjectName)\
AllRules.ruleset
true
diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index 77c31b1accf73cae3e2ef298ea08e7857f1ab1fd..53d7866ff4fafa03b18db6abcd2c507454312156 100644
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.c
@@ -16,7 +16,9 @@
extern gvplugin_installed_t gvdevice_dot_types[];
extern gvplugin_installed_t gvdevice_fig_types[];
extern gvplugin_installed_t gvdevice_map_types[];
+#if !defined(WIN32)
extern gvplugin_installed_t gvdevice_mp_types[];
+#endif
extern gvplugin_installed_t gvdevice_ps_types[];
extern gvplugin_installed_t gvdevice_svg_types[];
#if !defined(WIN32)
@@ -30,7 +32,9 @@ extern gvplugin_installed_t gvdevice_pov_types[];
extern gvplugin_installed_t gvrender_dot_types[];
extern gvplugin_installed_t gvrender_fig_types[];
extern gvplugin_installed_t gvrender_map_types[];
+#if !defined(WIN32)
extern gvplugin_installed_t gvrender_mp_types[];
+#endif
extern gvplugin_installed_t gvrender_ps_types[];
extern gvplugin_installed_t gvrender_svg_types[];
#if !defined(WIN32)
@@ -50,7 +54,9 @@ static gvplugin_api_t apis[] = {
{API_device, gvdevice_dot_types},
{API_device, gvdevice_fig_types},
{API_device, gvdevice_map_types},
+#if !defined(WIN32)
{API_device, gvdevice_mp_types},
+#endif
{API_device, gvdevice_ps_types},
{API_device, gvdevice_svg_types},
#if !defined(WIN32)
@@ -64,7 +70,9 @@ static gvplugin_api_t apis[] = {
{API_render, gvrender_dot_types},
{API_render, gvrender_fig_types},
{API_render, gvrender_map_types},
+#if !defined(WIN32)
{API_render, gvrender_mp_types},
+#endif
{API_render, gvrender_ps_types},
{API_render, gvrender_svg_types},
#if !defined(WIN32)
diff --git a/windows/include/ast_common.h b/windows/include/ast_common.h
index 70ef7a5baf3492b582644044f8abdd900d30ba76..43a88e45d1aa282201e4dc309cb7f7c33658bcb1 100644
--- a/windows/include/ast_common.h
+++ b/windows/include/ast_common.h
@@ -100,18 +100,18 @@
#define __DEFINE__(T,obj,val) T obj = val
#endif
#ifndef _AST_STD_H
-# if defined(_hdr_stddef)
+# if _hdr_stddef
# include
# endif
-# if defined(_sys_types)
+# if _sys_types
# include
# endif
#endif
-#if !defined(_typ_size_t)
+#if !_typ_size_t
# define _typ_size_t 1
typedef int size_t;
#endif
-#if !defined(_typ_ssize_t)
+#if !_typ_ssize_t
# define _typ_ssize_t 1
typedef int ssize_t;
#endif