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

(svn r25677) -Codechange: [Win32] There are no 64-bit Windows versions below XP and we can safely assume it as the target platform.

release/1.4
michi_cc 2013-08-05 20:36:58 +00:00
parent 765e7d349e
commit b96ef5c758
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,12 +10,6 @@
/** @file crashlog_win.cpp Implementation of a crashlogger for Windows */ /** @file crashlog_win.cpp Implementation of a crashlogger for Windows */
#include "../../stdafx.h" #include "../../stdafx.h"
#if defined(_MSC_VER) && defined(_M_AMD64)
/* Redefine WinNT version to get RtlCaptureContext prototype. */
#undef _WIN32_WINNT
#undef NTDDI_VERSION
#define _WIN32_WINNT _WIN32_WINNT_WINXP
#endif /* defined(_MSC_VER) && defined(_M_AMD64) */
#include "../../crashlog.h" #include "../../crashlog.h"
#include "win32.h" #include "win32.h"
#include "../../core/alloc_func.hpp" #include "../../core/alloc_func.hpp"

25
src/stdafx.h
View File

@ -177,15 +177,24 @@
/* Stuff for MSVC */ /* Stuff for MSVC */
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma once #pragma once
/* Define a win32 target platform, to override defaults of the SDK #ifdef _WIN64
* We need to define NTDDI version for Vista SDK, but win2k is minimum */ /* No 64-bit Windows below XP, so we can safely assume it as the target platform. */
#define NTDDI_VERSION NTDDI_WIN2K // Windows 2000 #define NTDDI_VERSION NTDDI_WINXP // Windows XP
#define _WIN32_WINNT 0x0500 // Windows 2000 #define _WIN32_WINNT 0x501 // Windows XP
#define _WIN32_WINDOWS 0x400 // Windows 95 #define _WIN32_WINDOWS 0x501 // Windows XP
#if !defined(WINCE) #define WINVER 0x0501 // Windows XP
#define WINVER 0x0400 // Windows NT 4.0 / Windows 95 #define _WIN32_IE_ 0x0600 // 6.0 (XP+)
#else
/* Define a win32 target platform, to override defaults of the SDK
* We need to define NTDDI version for Vista SDK, but win2k is minimum */
#define NTDDI_VERSION NTDDI_WIN2K // Windows 2000
#define _WIN32_WINNT 0x0500 // Windows 2000
#define _WIN32_WINDOWS 0x400 // Windows 95
#if !defined(WINCE)
#define WINVER 0x0400 // Windows NT 4.0 / Windows 95
#endif
#define _WIN32_IE_ 0x0401 // 4.01 (win98 and NT4SP5+)
#endif #endif
#define _WIN32_IE_ 0x0401 // 4.01 (win98 and NT4SP5+)
#define NOMINMAX // Disable min/max macros in windows.h. #define NOMINMAX // Disable min/max macros in windows.h.
#pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data #pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data