cpp/openttd-patchpack/source Changeset - r22200:a9da99055183

Changeset - r22200:a9da99055183

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

michi_cc - 9 years ago 2015-08-10 20:21:29
michi_cc@openttd.org

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

5 files changed with 8 insertions and 3 deletions:

src/music/dmusic.cpp

src/os/windows/crashlog_win.cpp

src/stdafx.h

src/strgen/strgen_base.cpp

src/string.cpp

0 comments (0 inline, 0 general)

src/music/dmusic.cpp

➞

Show inline comments

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

src/os/windows/crashlog_win.cpp

➞

Show inline comments

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

src/stdafx.h

➞

Show inline comments

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

src/strgen/strgen_base.cpp

➞

Show inline comments

@@ @@ -378,7 +378,7 @@ static int TranslateArgumentIdx(int arg, @@
 static void EmitWordList(Buffer *buffer, const char * const *words, uint 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 j = 0; words[i][j] != '\0'; j++) buffer->AppendByte(words[i][j]);
 		buffer->AppendByte(0);

src/string.cpp

➞

Show inline comments

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

0 comments (0 inline, 0 general)