aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/xauth/gethost.c5
-rw-r--r--apps/xauth/process.c2
-rwxr-xr-xfreetype/freetype.vcxproj18
-rw-r--r--include/stdbool.h7
-rw-r--r--libXaw/src/AsciiSrc.c2
-rw-r--r--libXaw/src/MultiSrc.c2
-rw-r--r--libXpm/src/RdFToBuf.c2
-rw-r--r--libXpm/src/RdFToI.c2
-rw-r--r--libXpm/src/WrFFrI.c2
-rw-r--r--libXt/src/ResConfig.c2
-rw-r--r--libwinmain/winmain.c12
-rw-r--r--makefile.before2
-rw-r--r--mesalib/src/glsl/builtin_functions.cpp8
-rw-r--r--mesalib/src/glsl/ir.cpp2
-rw-r--r--mesalib/src/glsl/ir_builder.cpp2
-rw-r--r--mesalib/src/glsl/ir_builder.h2
-rwxr-xr-xmesalib/src/glsl/ir_constant_expression.cpp7
-rw-r--r--mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj10
-rw-r--r--mesalib/windows/VC8/mesa/makefile6
-rw-r--r--mesalib/windows/VC8/mesa/mesa/mesa.vcxproj10
-rw-r--r--mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj10
-rw-r--r--tools/mhmake/mhmake.vcxproj8
-rw-r--r--xkbcomp/expr.c2
-rw-r--r--xkbcomp/utils.c2
-rw-r--r--xkbcomp/utils.h2
-rw-r--r--xorg-server/dix/devices.c4
-rw-r--r--xorg-server/dix/getevents.c4
-rw-r--r--xorg-server/hw/xwin/xlaunch/window/util.cc21
-rwxr-xr-xxorg-server/installer/packageall.bat24
-rw-r--r--xorg-server/installer/vcxsrv-64-debug.nsi8
-rw-r--r--xorg-server/installer/vcxsrv-64.nsi16
-rw-r--r--xorg-server/installer/vcxsrv-debug.nsi8
-rw-r--r--xorg-server/installer/vcxsrv.nsi16
-rw-r--r--xorg-server/mi/miarc.c1
-rw-r--r--zlib/gzlib.c14
35 files changed, 128 insertions, 117 deletions
diff --git a/apps/xauth/gethost.c b/apps/xauth/gethost.c
index acac86478..cac6e9ec1 100644
--- a/apps/xauth/gethost.c
+++ b/apps/xauth/gethost.c
@@ -72,6 +72,11 @@ in this Software without prior written authorization from The Open Group.
#ifndef WIN32
#include <arpa/inet.h>
+#else
+#if NTDDI_VERSION < NTDDI_VISTA
+int inet_pton(int af, const char *src, void *dst);
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
+#endif
#endif
#ifdef SIGALRM
diff --git a/apps/xauth/process.c b/apps/xauth/process.c
index a4021c7e6..f4f543cf8 100644
--- a/apps/xauth/process.c
+++ b/apps/xauth/process.c
@@ -810,7 +810,7 @@ write_auth_file(char *tmp_nam)
(void) unlink (tmp_nam);
/* CPhipps 2000/02/12 - fix file unlink/fopen race */
fd = open(tmp_nam, O_WRONLY | O_CREAT | O_EXCL, 0600);
- if (fd != -1) fp = fdopen (fd, "wb");
+ if (fd != -1) fp = _fdopen (fd, "wb");
if (!fp) {
if (fd != -1) close(fd);
fprintf (stderr, "%s: unable to open tmp file \"%s\"\n",
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index 86d867ac6..19cd49f9e 100755
--- a/freetype/freetype.vcxproj
+++ b/freetype/freetype.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Multithreaded|Win32">
<Configuration>Debug Multithreaded</Configuration>
@@ -43,49 +43,49 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/include/stdbool.h b/include/stdbool.h
index 24cf1c038..54b1fbeee 100644
--- a/include/stdbool.h
+++ b/include/stdbool.h
@@ -32,12 +32,7 @@
#define false 0
#define true 1
-#define bool _Bool
-
-/* For compilers that don't have the builtin _Bool type. */
-#if defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3)
-typedef unsigned char _Bool;
-#endif
+#define bool int
#endif /* !__cplusplus */
diff --git a/libXaw/src/AsciiSrc.c b/libXaw/src/AsciiSrc.c
index a37b6a1ff..bf2c42bc3 100644
--- a/libXaw/src/AsciiSrc.c
+++ b/libXaw/src/AsciiSrc.c
@@ -1486,7 +1486,7 @@ InitStringOrFile(AsciiSrcObject src, Bool newString)
if (!src->ascii_src.is_tempfile) {
if ((fd = open(src->ascii_src.string, open_mode, 0666)) != -1) {
- if ((file = fdopen(fd, fdopen_mode))) {
+ if ((file = _fdopen(fd, fdopen_mode))) {
(void)fseek(file, 0, SEEK_END);
src->ascii_src.length = (XawTextPosition)ftell(file);
return (file);
diff --git a/libXaw/src/MultiSrc.c b/libXaw/src/MultiSrc.c
index efa08b081..712b7e068 100644
--- a/libXaw/src/MultiSrc.c
+++ b/libXaw/src/MultiSrc.c
@@ -1258,7 +1258,7 @@ InitStringOrFile(MultiSrcObject src, Bool newString)
if (!src->multi_src.is_tempfile) {
if ((fd = open((char *)src->multi_src.string, open_mode, 0666)) != -1) {
- if ((file = fdopen(fd, fdopen_mode)) != NULL) {
+ if ((file = _fdopen(fd, fdopen_mode)) != NULL) {
(void)fseek(file, 0, SEEK_END);
src->multi_src.length = (XawTextPosition)ftell(file);
return(file);
diff --git a/libXpm/src/RdFToBuf.c b/libXpm/src/RdFToBuf.c
index 485e666c7..0594972a6 100644
--- a/libXpm/src/RdFToBuf.c
+++ b/libXpm/src/RdFToBuf.c
@@ -83,7 +83,7 @@ XpmReadFileToBuffer(
close(fd);
return XpmOpenFailed;
}
- fp = fdopen(fd, "r");
+ fp = _fdopen(fd, "r");
if (!fp) {
close(fd);
return XpmOpenFailed;
diff --git a/libXpm/src/RdFToI.c b/libXpm/src/RdFToI.c
index eff843dce..49fb2ed61 100644
--- a/libXpm/src/RdFToI.c
+++ b/libXpm/src/RdFToI.c
@@ -247,7 +247,7 @@ OpenReadFile(
#endif /* z-files */
{
mdata->type = XPMFILE;
- mdata->stream.file = fdopen(fd, "r");
+ mdata->stream.file = _fdopen(fd, "r");
}
if (!mdata->stream.file)
{
diff --git a/libXpm/src/WrFFrI.c b/libXpm/src/WrFFrI.c
index 067c96b3a..e05ff9855 100644
--- a/libXpm/src/WrFFrI.c
+++ b/libXpm/src/WrFFrI.c
@@ -344,7 +344,7 @@ OpenWriteFile(
} else
#endif
{
- mdata->stream.file = fdopen(fd, "w");
+ mdata->stream.file = _fdopen(fd, "w");
mdata->type = XPMFILE;
}
if (!mdata->stream.file) {
diff --git a/libXt/src/ResConfig.c b/libXt/src/ResConfig.c
index 68da5364c..21ea14292 100644
--- a/libXt/src/ResConfig.c
+++ b/libXt/src/ResConfig.c
@@ -913,7 +913,7 @@ _XtResourceConfigurationEH (
fprintf (stderr, "in _XtResourceConfiguationEH atom = %d\n",event->xproperty.atom);
fprintf (stderr, " window = %x\n", XtWindow (w));
if (XtIsWidget (w))
- fprintf (stderr, " widget = %x name = %s\n", w, w->core.name);
+ fprintf (stderr, " widget = %p name = %s\n", w, w->core.name);
#endif
pd = _XtGetPerDisplay (XtDisplay (w));
diff --git a/libwinmain/winmain.c b/libwinmain/winmain.c
index a91ad26ab..65c6e7919 100644
--- a/libwinmain/winmain.c
+++ b/libwinmain/winmain.c
@@ -43,24 +43,24 @@ static void CreateConsole(void)
// redirect unbuffered STDOUT to the console
lStdHandle = GetStdHandle(STD_OUTPUT_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
if (hConHandle==-1) // error occured, so return
return;
- fp = fdopen( hConHandle, "w" );
+ fp = _fdopen( hConHandle, "w" );
*stdout = *fp;
setvbuf( stdout, NULL, _IONBF, 0 );
// redirect unbuffered STDIN to the console
lStdHandle = GetStdHandle(STD_INPUT_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
- fp = fdopen( hConHandle, "r" );
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
+ fp = _fdopen( hConHandle, "r" );
*stdin = *fp;
setvbuf( stdin, NULL, _IONBF, 0 );
// redirect unbuffered STDERR to the console
lStdHandle = GetStdHandle(STD_ERROR_HANDLE);
- hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
- fp = fdopen( hConHandle, "w" );
+ hConHandle = _open_osfhandle((intptr_t)lStdHandle, _O_TEXT);
+ fp = _fdopen( hConHandle, "w" );
*stderr = *fp;
setvbuf( stderr, NULL, _IONBF, 0 );
}
diff --git a/makefile.before b/makefile.before
index 5d7ca04e9..a3bde8af0 100644
--- a/makefile.before
+++ b/makefile.before
@@ -17,7 +17,7 @@ NOT=$(if $(findstring 0,$(1)),1,0)
CC ?= cl /nologo
CPP ?= $(CC)
-CCFLAGS += -c -GF -Gy #-Wall
+CCFLAGS += -c -GF -Gy -FS #-Wall
#CCFLAGS += -wd4996 -wd4738
LINK ?= link /nologo
diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp
index 8cb75e5ad..a45de091b 100644
--- a/mesalib/src/glsl/builtin_functions.cpp
+++ b/mesalib/src/glsl/builtin_functions.cpp
@@ -558,7 +558,7 @@ private:
B1(bitCount)
B1(findLSB)
B1(findMSB)
- B1(fma)
+ B1(fma_mesa)
B2(ldexp)
B2(frexp)
B1(uaddCarry)
@@ -2053,7 +2053,7 @@ builtin_builder::create_builtins()
IU(bitCount)
IU(findLSB)
IU(findMSB)
- F(fma)
+ F(fma_mesa)
add_function("ldexp",
_ldexp(glsl_type::float_type, glsl_type::int_type),
@@ -3857,14 +3857,14 @@ builtin_builder::_findMSB(const glsl_type *type)
}
ir_function_signature *
-builtin_builder::_fma(const glsl_type *type)
+builtin_builder::_fma_mesa(const glsl_type *type)
{
ir_variable *a = in_var(type, "a");
ir_variable *b = in_var(type, "b");
ir_variable *c = in_var(type, "c");
MAKE_SIG(type, gpu_shader5, 3, a, b, c);
- body.emit(ret(fma(a, b, c)));
+ body.emit(ret(fma_mesa(a, b, c)));
return sig;
}
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index 1b4973612..9715a203e 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -560,7 +560,7 @@ static const char *const operator_strs[] = {
"ubo_load",
"ldexp",
"vector_extract",
- "fma",
+ "fma_mesa",
"lrp",
"csel",
"bfi",
diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp
index 6c49734be..6fd58de0e 100644
--- a/mesalib/src/glsl/ir_builder.cpp
+++ b/mesalib/src/glsl/ir_builder.cpp
@@ -496,7 +496,7 @@ b2f(operand a)
}
ir_expression *
-fma(operand a, operand b, operand c)
+fma_mesa(operand a, operand b, operand c)
{
return expr(ir_triop_fma, a, b, c);
}
diff --git a/mesalib/src/glsl/ir_builder.h b/mesalib/src/glsl/ir_builder.h
index 1f0778870..52cc2168f 100644
--- a/mesalib/src/glsl/ir_builder.h
+++ b/mesalib/src/glsl/ir_builder.h
@@ -184,7 +184,7 @@ ir_expression *i2b(operand a);
ir_expression *f2b(operand a);
ir_expression *b2f(operand a);
-ir_expression *fma(operand a, operand b, operand c);
+ir_expression *fma_mesa(operand a, operand b, operand c);
ir_expression *lrp(operand x, operand y, operand a);
ir_expression *csel(operand a, operand b, operand c);
ir_expression *bitfield_insert(operand a, operand b, operand c, operand d);
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp
index 02368b0f4..54bfe5832 100755
--- a/mesalib/src/glsl/ir_constant_expression.cpp
+++ b/mesalib/src/glsl/ir_constant_expression.cpp
@@ -53,13 +53,6 @@ static int isnormal(double x)
}
#endif
-#if defined(_MSC_VER)
-static double copysign(double x, double y)
-{
- return _copysign(x, y);
-}
-#endif
-
static float
dot(ir_constant *op0, ir_constant *op1)
{
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index f52c2402b..382544612 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -28,23 +28,23 @@
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile
index 3134b51ae..c5896231d 100644
--- a/mesalib/windows/VC8/mesa/makefile
+++ b/mesalib/windows/VC8/mesa/makefile
@@ -51,10 +51,14 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \
..\..\..\src\mesa\main\enums.c \
..\..\..\src\mesa\main\api_exec.c \
..\..\..\src\mesa\main\get_hash.h \
- ..\..\..\src\mesa\main\remap_helper.h
+ ..\..\..\src\mesa\main\remap_helper.h \
+ ..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h
all: $(TARGETDIR)\Release\swrast_dri.dll $(TARGETDIR)\Debug\swrast_dri.dll
+..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h: ..\..\..\src\mesa\drivers\dri\common\xmlpool\t_options.h ..\..\..\src\mesa\drivers\dri\common\xmlpool\gen_xmlpool.py
+ cd ..\..\..\src\mesa\drivers\dri\common\xmlpool & python gen_xmlpool.py t_options.h . > options.h
+
..\..\..\src\mesa\main\dispatch.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_table.py
cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml -m remap_table > ..\..\..\mesa\main\dispatch.h
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index f7ca24087..4378bc40e 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,25 +27,25 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
index f7d8a28b9..47d154794 100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,25 +27,25 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/tools/mhmake/mhmake.vcxproj b/tools/mhmake/mhmake.vcxproj
index e50224eba..be7544606 100644
--- a/tools/mhmake/mhmake.vcxproj
+++ b/tools/mhmake/mhmake.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -36,34 +36,40 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/xkbcomp/expr.c b/xkbcomp/expr.c
index e0f957c15..09ffca1d8 100644
--- a/xkbcomp/expr.c
+++ b/xkbcomp/expr.c
@@ -729,7 +729,7 @@ ExprResolveString(ExprDef * expr,
val_rtrn->str = XkbAtomGetString(NULL, expr->value.str);
if (val_rtrn->str == NULL)
{
- static const char *empty = "";
+ static char *empty = "";
val_rtrn->str = empty;
}
return True;
diff --git a/xkbcomp/utils.c b/xkbcomp/utils.c
index 541c33e14..53dc99472 100644
--- a/xkbcomp/utils.c
+++ b/xkbcomp/utils.c
@@ -352,7 +352,7 @@ uStrCaseCmp(const char *str1, const char *str2)
}
int
-uStrCasePrefix(const char *my_prefix, char *str)
+uStrCasePrefix(const char *my_prefix, const char *str)
{
char c1;
char c2;
diff --git a/xkbcomp/utils.h b/xkbcomp/utils.h
index b644f7d3a..e51d1a091 100644
--- a/xkbcomp/utils.h
+++ b/xkbcomp/utils.h
@@ -210,7 +210,7 @@ uInformation(const char * /* s */ , ...
const char * /* s2 */
);
extern int uStrCasePrefix(const char * /* p */ ,
- char * /* str */
+ const char * /* str */
);
#endif
#ifdef HAVE_STRDUP
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index c5c8daafe..1f5193c1b 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -86,10 +86,6 @@ SOFTWARE.
#include "xichangehierarchy.h" /* For XISendDeviceHierarchyEvent */
#include "syncsrv.h"
-#ifdef _MSC_VER
-#define isfinite(val) _finite(val)
-#endif
-
/** @file
* This file handles input device-related stuff.
*/
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index dd99c2895..3b87e17d4 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -78,10 +78,6 @@ typedef const char *string;
#ifdef _MSC_VER
#include <math.h>
-float roundf(float f)
-{
- return ((f<0.0f) ? ceil(f-.5) : floor (f+.5));
-}
double roundd(double f)
{
return ((f<0.0) ? ceil(f-.5) : floor (f+.5));
diff --git a/xorg-server/hw/xwin/xlaunch/window/util.cc b/xorg-server/hw/xwin/xlaunch/window/util.cc
index 6f768348e..c01b782fc 100644
--- a/xorg-server/hw/xwin/xlaunch/window/util.cc
+++ b/xorg-server/hw/xwin/xlaunch/window/util.cc
@@ -30,9 +30,9 @@ const char * MessageDebug::notify_names[NOTIFY_NAMES_LEN];
std::string win32_error::message(DWORD errorcode)
{
LPVOID lpMsgBuf;
- if (!FormatMessage(
- FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
+ if (!FormatMessage(
+ FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
errorcode,
@@ -68,19 +68,19 @@ void MessageDebug::debug(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, con
LPNMHDR pnmh = (LPNMHDR)lParam;
int psn_index = -(int)pnmh->code - 200;
if (psn_index >= 0 && psn_index < 10 && psn_notify[psn_index])
- printf("%s: %08x %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, psn_notify[psn_index]);
+ printf("%s: %p %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, psn_notify[psn_index]);
else if (pnmh->code < NOTIFY_NAMES_LEN && notify_names[pnmh->code])
- printf("%s: %08x %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, notify_names[pnmh->code]);
+ printf("%s: %p %04x WM_NOTIFY (%s)\n", prefix, hwnd, wParam, notify_names[pnmh->code]);
else
- printf("%s: %08x %04x WM_NOTIFY (%u)\n", prefix, hwnd, wParam, pnmh->code);
- }
+ printf("%s: %p %04x WM_NOTIFY (%u)\n", prefix, hwnd, wParam, pnmh->code);
+ }
else if (uMsg >= MESSAGE_NAMES_LEN)
if (uMsg >= WM_USER)
- printf("%s: %08x %04x %08x WM_USER + %d\n", prefix, hwnd, wParam, lParam, uMsg - WM_USER);
+ printf("%s: %p %04x %08x WM_USER + %d\n", prefix, hwnd, wParam, lParam, uMsg - WM_USER);
else
- printf("%s: %08x %04x %08x %d\n", prefix, hwnd, wParam, lParam, uMsg);
+ printf("%s: %p %04x %08x %d\n", prefix, hwnd, wParam, lParam, uMsg);
else if (uMsg >= 0 && uMsg < MESSAGE_NAMES_LEN && message_names[uMsg])
- printf("%s: %08x %04x %08x %s\n", prefix, hwnd, wParam, lParam, message_names[uMsg]);
+ printf("%s: %p %04x %08x %s\n", prefix, hwnd, wParam, lParam, message_names[uMsg]);
#endif
}
@@ -1111,4 +1111,3 @@ const char * MessageDebug::message_names[MESSAGE_NAMES_LEN] = {
"1022",
"1023"
};
-
diff --git a/xorg-server/installer/packageall.bat b/xorg-server/installer/packageall.bat
index d8b245029..5e9677e6e 100755
--- a/xorg-server/installer/packageall.bat
+++ b/xorg-server/installer/packageall.bat
@@ -3,10 +3,10 @@ if exist vcxsrv*.installer.exe del vcxsrv*.installer.exe
if "%1"=="nox86" goto skipx86
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcp110.dll"
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x86\Microsoft.VC110.CRT\msvcr110.dll"
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcp110d.dll"
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC110.DebugCRT\msvcr110d.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcp120.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcr120.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcp120d.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x86\Microsoft.VC120.DebugCRT\msvcr120d.dll"
if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
"C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv.nsi
@@ -19,10 +19,10 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
:skipx86
if "%1"=="nox64" goto skipx64
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcp110.dll"
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\x64\Microsoft.VC110.CRT\msvcr110.dll"
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcp110d.dll"
-copy "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC110.DebugCRT\msvcr110d.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcp120.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcp120d.dll"
+copy "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\Debug_NonRedist\x64\Microsoft.VC120.DebugCRT\msvcr120d.dll"
if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
"C:\Program Files (x86)\NSIS\Unicode\makensis.exe" vcxsrv-64.nsi
@@ -34,7 +34,7 @@ if exist "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" (
:skipx64
-del msvcr110.dll
-del msvcr110d.dll
-del msvcp110.dll
-del msvcp110d.dll
+del msvcr120.dll
+del msvcr120d.dll
+del msvcp120.dll
+del msvcp120d.dll
diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi
index 470d9c6b8..f93a32c78 100644
--- a/xorg-server/installer/vcxsrv-64-debug.nsi
+++ b/xorg-server/installer/vcxsrv-64-debug.nsi
@@ -65,6 +65,10 @@ Section "VcXsrv debug exe and dlls"
Delete "$INSTDIR\msvcr100d.dll"
IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2
Delete "$INSTDIR\msvcp100d.dll"
+ IfFileExists "$INSTDIR\msvcr110d.dll" 0 +2
+ Delete "$INSTDIR\msvcr110d.dll"
+ IfFileExists "$INSTDIR\msvcp110d.dll" 0 +2
+ Delete "$INSTDIR\msvcp110d.dll"
; Put files there
File "..\obj64\servdebug\vcxsrv.exe"
@@ -86,8 +90,8 @@ Section "VcXsrv debug exe and dlls"
File "..\..\libX11\obj64\debug\libX11.dll"
File "..\..\libXext\src\obj64\debug\libXext.dll"
File "..\..\libXmu\src\obj64\debug\libXmu.dll"
- File "msvcr110d.dll"
- File "msvcp110d.dll"
+ File "msvcr120d.dll"
+ File "msvcp120d.dll"
WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir_64" $INSTDIR
SectionEnd
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi
index 9c04e3ef8..d452c0634 100644
--- a/xorg-server/installer/vcxsrv-64.nsi
+++ b/xorg-server/installer/vcxsrv-64.nsi
@@ -69,6 +69,10 @@ Section "VcXsrv (required)"
Delete "$INSTDIR\msvcr100.dll"
IfFileExists "$INSTDIR\msvcp100.dll" 0 +2
Delete "$INSTDIR\msvcp100.dll"
+ IfFileExists "$INSTDIR\msvcr110.dll" 0 +2
+ Delete "$INSTDIR\msvcr110.dll"
+ IfFileExists "$INSTDIR\msvcp110.dll" 0 +2
+ Delete "$INSTDIR\msvcp110.dll"
; Put files there
File "..\obj64\servrelease\vcxsrv.exe"
@@ -105,8 +109,8 @@ Section "VcXsrv (required)"
File "..\..\libX11\obj64\release\libX11.dll"
File "..\..\libXext\src\obj64\release\libXext.dll"
File "..\..\libXmu\src\obj64\release\libXmu.dll"
- File "msvcr110.dll"
- File "msvcp110.dll"
+ File "msvcr120.dll"
+ File "msvcp120.dll"
SetOutPath $INSTDIR\xkbdata
File /r "..\xkbdata\*.*"
SetOutPath $INSTDIR\locale
@@ -230,10 +234,10 @@ Section "Uninstall"
Delete "$INSTDIR\libxml2.dll"
Delete "$INSTDIR\zlib1.dll"
Delete "$INSTDIR\iconv.dll"
- Delete "$INSTDIR\msvcr110.dll"
- Delete "$INSTDIR\msvcp110.dll"
- Delete "$INSTDIR\msvcr110d.dll"
- Delete "$INSTDIR\msvcp110d.dll"
+ Delete "$INSTDIR\msvcr120.dll"
+ Delete "$INSTDIR\msvcp120.dll"
+ Delete "$INSTDIR\msvcr120d.dll"
+ Delete "$INSTDIR\msvcp120d.dll"
RMDir /r "$INSTDIR\fonts"
RMDir /r "$INSTDIR\xkbdata"
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index 8a3ea204a..7ca89fd61 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -65,6 +65,10 @@ Section "VcXsrv debug exe and dlls"
Delete "$INSTDIR\msvcr100d.dll"
IfFileExists "$INSTDIR\msvcp100d.dll" 0 +2
Delete "$INSTDIR\msvcp100d.dll"
+ IfFileExists "$INSTDIR\msvcr110d.dll" 0 +2
+ Delete "$INSTDIR\msvcr110d.dll"
+ IfFileExists "$INSTDIR\msvcp110d.dll" 0 +2
+ Delete "$INSTDIR\msvcp110d.dll"
; Put files there
File "..\obj\servdebug\vcxsrv.exe"
@@ -86,8 +90,8 @@ Section "VcXsrv debug exe and dlls"
File "..\..\libX11\obj\debug\libX11.dll"
File "..\..\libXext\src\obj\debug\libXext.dll"
File "..\..\libXmu\src\obj\debug\libXmu.dll"
- File "msvcr110d.dll"
- File "msvcp110d.dll"
+ File "msvcr120d.dll"
+ File "msvcp120d.dll"
WriteRegStr HKLM SOFTWARE\VcXsrv "Install_Dir" "$INSTDIR"
SectionEnd
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index f7e02a9ce..54186a3b9 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -69,6 +69,10 @@ Section "VcXsrv (required)"
Delete "$INSTDIR\msvcr100.dll"
IfFileExists "$INSTDIR\msvcp100.dll" 0 +2
Delete "$INSTDIR\msvcp100.dll"
+ IfFileExists "$INSTDIR\msvcr110.dll" 0 +2
+ Delete "$INSTDIR\msvcr110.dll"
+ IfFileExists "$INSTDIR\msvcp110.dll" 0 +2
+ Delete "$INSTDIR\msvcp110.dll"
; Put files there
File "..\obj\servrelease\vcxsrv.exe"
@@ -105,8 +109,8 @@ Section "VcXsrv (required)"
File "..\..\libX11\obj\release\libX11.dll"
File "..\..\libXext\src\obj\release\libXext.dll"
File "..\..\libXmu\src\obj\release\libXmu.dll"
- File "msvcr110.dll"
- File "msvcp110.dll"
+ File "msvcr120.dll"
+ File "msvcp120.dll"
SetOutPath $INSTDIR\xkbdata
File /r "..\xkbdata\*.*"
SetOutPath $INSTDIR\locale
@@ -230,10 +234,10 @@ Section "Uninstall"
Delete "$INSTDIR\libxml2.dll"
Delete "$INSTDIR\zlib1.dll"
Delete "$INSTDIR\iconv.dll"
- Delete "$INSTDIR\msvcr110.dll"
- Delete "$INSTDIR\msvcp110.dll"
- Delete "$INSTDIR\msvcr110d.dll"
- Delete "$INSTDIR\msvcp110d.dll"
+ Delete "$INSTDIR\msvcr120.dll"
+ Delete "$INSTDIR\msvcp120.dll"
+ Delete "$INSTDIR\msvcr120d.dll"
+ Delete "$INSTDIR\msvcp120d.dll"
RMDir /r "$INSTDIR\fonts"
RMDir /r "$INSTDIR\xkbdata"
diff --git a/xorg-server/mi/miarc.c b/xorg-server/mi/miarc.c
index a73bce9e6..edb80bfe3 100644
--- a/xorg-server/mi/miarc.c
+++ b/xorg-server/mi/miarc.c
@@ -65,6 +65,7 @@ SOFTWARE.
#ifdef _MSC_VER
#define hypot _hypot
+#define HAVE_CBRT
#endif
static double miDsin(double a);
diff --git a/zlib/gzlib.c b/zlib/gzlib.c
index fae202ef8..1819af951 100644
--- a/zlib/gzlib.c
+++ b/zlib/gzlib.c
@@ -99,7 +99,7 @@ local gzFile gz_open(path, fd, mode)
#ifdef O_CLOEXEC
int cloexec = 0;
#endif
-#ifdef O_EXCL
+#ifdef _O_EXCL
int exclusive = 0;
#endif
@@ -228,14 +228,14 @@ local gzFile gz_open(path, fd, mode)
(cloexec ? O_CLOEXEC : 0) |
#endif
(state->mode == GZ_READ ?
- O_RDONLY :
- (O_WRONLY | O_CREAT |
-#ifdef O_EXCL
- (exclusive ? O_EXCL : 0) |
+ _O_RDONLY :
+ (_O_WRONLY | _O_CREAT |
+#ifdef _O_EXCL
+ (exclusive ? _O_EXCL : 0) |
#endif
(state->mode == GZ_WRITE ?
- O_TRUNC :
- O_APPEND)));
+ _O_TRUNC :
+ _O_APPEND)));
/* open the file with the appropriate flags (or just use fd) */
state->fd = fd > -1 ? fd : (