From 49017bc699b43b954df2913b7d0cbe296adb9fa0 Mon Sep 17 00:00:00 2001 From: Jonathan Lima Date: Thu, 26 Sep 2013 13:56:16 -0300 Subject: [PATCH] Fix MSVC build. --- mcs/jay/jay.vcxproj | 6 +++--- mono/utils/dlmalloc.c | 2 +- mono/utils/mono-compiler.h | 1 + msvc/eglib.vcxproj | 10 +++++----- msvc/genmdesc.vcxproj | 10 +++++----- msvc/libgc.vcxproj | 10 +++++----- msvc/libmono.vcxproj | 18 +++++++++--------- msvc/libmonoruntime.vcxproj | 9 ++++----- msvc/libmonoutils.vcxproj | 10 +++++----- msvc/libtest.vcxproj | 10 +++++----- msvc/mono.vcxproj | 18 +++++++++--------- msvc/monodiet.vcxproj | 10 +++++----- msvc/monodis.vcxproj | 10 +++++----- msvc/monograph.vcxproj | 10 +++++----- msvc/monoposixhelper.vcxproj | 10 +++++----- msvc/pedump.vcxproj | 10 +++++----- msvc/profiler-codeanalyst.vcxproj | 10 +++++----- msvc/profiler-cov.vcxproj | 10 +++++----- msvc/profiler-logging.vcxproj | 10 +++++----- msvc/profiler-vtune.vcxproj | 10 +++++----- msvc/test-invoke.vcxproj | 10 +++++----- msvc/test-metadata.vcxproj | 10 +++++----- msvc/test_eglib.vcxproj | 10 +++++----- msvc/teste.vcxproj | 10 +++++----- 24 files changed, 117 insertions(+), 117 deletions(-) diff --git a/mcs/jay/jay.vcxproj b/mcs/jay/jay.vcxproj index 03ee9cc3b07..80468e43cca 100644 --- a/mcs/jay/jay.vcxproj +++ b/mcs/jay/jay.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,12 +19,12 @@ Application MultiByte - v110 + v120 Application MultiByte - v110 + v120 diff --git a/mono/utils/dlmalloc.c b/mono/utils/dlmalloc.c index 59287aac775..f83272f88e6 100644 --- a/mono/utils/dlmalloc.c +++ b/mono/utils/dlmalloc.c @@ -24,7 +24,7 @@ /* Use mmap for allocating memory */ #define HAVE_MORECORE 0 #define NO_MALLINFO 1 -#include +#include /* * Quickstart diff --git a/mono/utils/mono-compiler.h b/mono/utils/mono-compiler.h index 56f5ea90add..6772dacfd50 100644 --- a/mono/utils/mono-compiler.h +++ b/mono/utils/mono-compiler.h @@ -187,6 +187,7 @@ /* Deal with Microsoft C compiler differences */ #ifdef _MSC_VER +#include #include #define isnan(x) _isnan(x) #define trunc(x) (((x) < 0) ? ceil((x)) : floor((x))) diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj index b7edc5e83f1..048d96d0c63 100644 --- a/msvc/eglib.vcxproj +++ b/msvc/eglib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ StaticLibrary Unicode - v110 + v120 StaticLibrary Unicode - v110 + v120 StaticLibrary Unicode - v110 + v120 StaticLibrary Unicode - v110 + v120 diff --git a/msvc/genmdesc.vcxproj b/msvc/genmdesc.vcxproj index aa5e37085ac..37f1d70dfc3 100644 --- a/msvc/genmdesc.vcxproj +++ b/msvc/genmdesc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false Unicode - v110 + v120 Application false Unicode - v110 + v120 Application false Unicode - v110 + v120 Application false Unicode - v110 + v120 diff --git a/msvc/libgc.vcxproj b/msvc/libgc.vcxproj index 1b2327d7564..f5cf3627df7 100644 --- a/msvc/libgc.vcxproj +++ b/msvc/libgc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ StaticLibrary Unicode - v110 + v120 StaticLibrary Unicode - v110 + v120 StaticLibrary Unicode - v110 + v120 StaticLibrary Unicode - v110 + v120 diff --git a/msvc/libmono.vcxproj b/msvc/libmono.vcxproj index d818b95c7db..ceb0619d28c 100644 --- a/msvc/libmono.vcxproj +++ b/msvc/libmono.vcxproj @@ -1,5 +1,5 @@  - + Debug_SGen @@ -156,49 +156,49 @@ DynamicLibrary false Unicode - v110 + v120 DynamicLibrary false Unicode - v110 + v120 DynamicLibrary false Unicode - v110 + v120 DynamicLibrary false Unicode - v110 + v120 DynamicLibrary false Unicode - v110 + v120 DynamicLibrary false Unicode - v110 + v120 DynamicLibrary false Unicode - v110 + v120 DynamicLibrary false Unicode - v110 + v120 diff --git a/msvc/libmonoruntime.vcxproj b/msvc/libmonoruntime.vcxproj index 4e72f6ad1a6..3ad4ff65915 100644 --- a/msvc/libmonoruntime.vcxproj +++ b/msvc/libmonoruntime.vcxproj @@ -113,7 +113,6 @@ - @@ -221,13 +220,13 @@ StaticLibrary true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary @@ -245,13 +244,13 @@ StaticLibrary false Unicode - v110 + v120 StaticLibrary false Unicode - v110 + v120 StaticLibrary diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index d4e76000a8b..8c3ef282414 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -137,25 +137,25 @@ StaticLibrary true Unicode - v110 + v120 StaticLibrary true Unicode - v110 + v120 StaticLibrary false Unicode - v110 + v120 StaticLibrary false Unicode - v110 + v120 diff --git a/msvc/libtest.vcxproj b/msvc/libtest.vcxproj index fbe0a89b032..b0b447bc8c2 100644 --- a/msvc/libtest.vcxproj +++ b/msvc/libtest.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 diff --git a/msvc/mono.vcxproj b/msvc/mono.vcxproj index 56eb4665d80..3ecf25bff1e 100644 --- a/msvc/mono.vcxproj +++ b/msvc/mono.vcxproj @@ -1,5 +1,5 @@  - + Debug_SGen @@ -44,42 +44,42 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/monodiet.vcxproj b/msvc/monodiet.vcxproj index 2dd2d2631f8..b4b2c4e5d80 100644 --- a/msvc/monodiet.vcxproj +++ b/msvc/monodiet.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/monodis.vcxproj b/msvc/monodis.vcxproj index 17ff95c816e..b9cae332c8e 100644 --- a/msvc/monodis.vcxproj +++ b/msvc/monodis.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/monograph.vcxproj b/msvc/monograph.vcxproj index d8e0599e91d..f77df6ffae8 100644 --- a/msvc/monograph.vcxproj +++ b/msvc/monograph.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/monoposixhelper.vcxproj b/msvc/monoposixhelper.vcxproj index edb6ce136eb..aafc552c829 100644 --- a/msvc/monoposixhelper.vcxproj +++ b/msvc/monoposixhelper.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 diff --git a/msvc/pedump.vcxproj b/msvc/pedump.vcxproj index 1116f3b8904..5e57c01b5dd 100644 --- a/msvc/pedump.vcxproj +++ b/msvc/pedump.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/profiler-codeanalyst.vcxproj b/msvc/profiler-codeanalyst.vcxproj index ee2255af874..d9d013ce515 100644 --- a/msvc/profiler-codeanalyst.vcxproj +++ b/msvc/profiler-codeanalyst.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 diff --git a/msvc/profiler-cov.vcxproj b/msvc/profiler-cov.vcxproj index d24d2858aa2..da7aaa3e67d 100644 --- a/msvc/profiler-cov.vcxproj +++ b/msvc/profiler-cov.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 diff --git a/msvc/profiler-logging.vcxproj b/msvc/profiler-logging.vcxproj index 5038b830f87..22a2c1bdaed 100644 --- a/msvc/profiler-logging.vcxproj +++ b/msvc/profiler-logging.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 diff --git a/msvc/profiler-vtune.vcxproj b/msvc/profiler-vtune.vcxproj index 60faa3ffd7b..582cca988bc 100644 --- a/msvc/profiler-vtune.vcxproj +++ b/msvc/profiler-vtune.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 DynamicLibrary Unicode - v110 + v120 diff --git a/msvc/test-invoke.vcxproj b/msvc/test-invoke.vcxproj index 161940e62f4..ecfc8d6953c 100644 --- a/msvc/test-invoke.vcxproj +++ b/msvc/test-invoke.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/test-metadata.vcxproj b/msvc/test-metadata.vcxproj index 51e48f432a8..3159e42dbb8 100644 --- a/msvc/test-metadata.vcxproj +++ b/msvc/test-metadata.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj index f87a9c2c976..69a9aefb9c0 100644 --- a/msvc/test_eglib.vcxproj +++ b/msvc/test_eglib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 diff --git a/msvc/teste.vcxproj b/msvc/teste.vcxproj index 19a6dcb76d6..8ec30a352f2 100644 --- a/msvc/teste.vcxproj +++ b/msvc/teste.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 Application Unicode - v110 + v120 -- 2.25.1