mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27380) -Fix: [Win32] Compilation with MSVC2015.

release/1.6
michi_cc 2015-08-10 20:21:29 +00:00
parent e5d105900d
commit 35b77450f8
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/music/dmusic.cpp
View File

@ -22,6 +22,7 @@
#include "dmusic.h" #include "dmusic.h"
#include <windows.h> #include <windows.h>
#undef FACILITY_DIRECTMUSIC // Needed for newer Windows SDK version.
#include <dmksctrl.h> #include <dmksctrl.h>
#include <dmusici.h> #include <dmusici.h>
#include <dmusicc.h> #include <dmusicc.h>

2
src/os/windows/crashlog_win.cpp
View File

@ -322,7 +322,9 @@ static char *PrintModuleInfo(char *output, const char *last, HMODULE mod)
} }
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(disable:4091)
#include <dbghelp.h> #include <dbghelp.h>
#pragma warning(default:4091)
char *CrashLogWindows::AppendDecodedStacktrace(char *buffer, const char *last) const char *CrashLogWindows::AppendDecodedStacktrace(char *buffer, const char *last) const
{ {

4
src/stdafx.h
View File

@ -223,7 +223,9 @@
#include <malloc.h> // alloca() #include <malloc.h> // alloca()
#define NORETURN __declspec(noreturn) #define NORETURN __declspec(noreturn)
#define inline __forceinline #if (_MSC_VER < 1900)
#define inline __forceinline
#endif
#if !defined(WINCE) #if !defined(WINCE)
#define CDECL _cdecl #define CDECL _cdecl

2
src/strgen/strgen_base.cpp
View File

@ -378,7 +378,7 @@ static int TranslateArgumentIdx(int arg, int offset = 0);
static void EmitWordList(Buffer *buffer, const char * const *words, uint nw) static void EmitWordList(Buffer *buffer, const char * const *words, uint nw)
{ {
buffer->AppendByte(nw); buffer->AppendByte(nw);
for (uint i = 0; i < nw; i++) buffer->AppendByte((uint)strlen(words[i]) + 1); for (uint i = 0; i < nw; i++) buffer->AppendByte((byte)strlen(words[i]) + 1);
for (uint i = 0; i < nw; i++) { for (uint i = 0; i < nw; i++) {
for (uint j = 0; words[i][j] != '\0'; j++) buffer->AppendByte(words[i][j]); for (uint j = 0; words[i][j] != '\0'; j++) buffer->AppendByte(words[i][j]);
buffer->AppendByte(0); buffer->AppendByte(0);

2
src/string.cpp
View File

@ -349,7 +349,7 @@ bool IsValidChar(WChar key, CharSetFilter afilter)
} }
#ifdef WIN32 #ifdef WIN32
#ifdef _MSC_VER #if defined(_MSC_VER) && _MSC_VER < 1900
/** /**
* Almost POSIX compliant implementation of \c vsnprintf for VC compiler. * Almost POSIX compliant implementation of \c vsnprintf for VC compiler.
* The difference is in the value returned on output truncation. This * The difference is in the value returned on output truncation. This