From c4dc754f2fdc9c0d3e71daa41b68634e57219ebc Mon Sep 17 00:00:00 2001 From: pionere Date: Wed, 20 Sep 2023 15:55:39 +0200 Subject: [PATCH] no need to check for _WIN64 --- Source/init.cpp | 4 ++-- Source/utils/console.h | 2 +- Source/utils/file_util.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/init.cpp b/Source/init.cpp index c892fb8611e..e3d28b81f93 100644 --- a/Source/init.cpp +++ b/Source/init.cpp @@ -3,7 +3,7 @@ * * Implementation of routines for initializing the environment, disable screen saver, load MPQ. */ -//#if defined(_WIN64) || defined(_WIN32) +//#if defined(_WIN32) //#include //#endif @@ -101,7 +101,7 @@ void InitArchives() return; #endif HANDLE diabdat_mpqs[NUM_MPQS]; -/*#elif defined(_WIN64) || defined(_WIN32) +/*#elif defined(_WIN32) char gogpath[_FSG_PATH_MAX]; fsg_get_gog_game_path(gogpath, "1412601690"); if (strlen(gogpath) > 0) { diff --git a/Source/utils/console.h b/Source/utils/console.h index aff2693394f..a5787f715c2 100644 --- a/Source/utils/console.h +++ b/Source/utils/console.h @@ -1,6 +1,6 @@ #pragma once -#if defined(_WIN64) || defined(_WIN32) +#if defined(_WIN32) // Suppress definitions of `min` and `max` macros by : #define NOMINMAX 1 #define WIN32_LEAN_AND_MEAN diff --git a/Source/utils/file_util.h b/Source/utils/file_util.h index 2c53d8b12d6..739b6dd69aa 100644 --- a/Source/utils/file_util.h +++ b/Source/utils/file_util.h @@ -12,7 +12,7 @@ #include "log.h" -#if defined(_WIN64) || defined(_WIN32) +#if defined(_WIN32) // Suppress definitions of `min` and `max` macros by : #define NOMINMAX 1 #define WIN32_LEAN_AND_MEAN @@ -56,7 +56,7 @@ inline bool FileExists(const char* path) inline bool GetFileSize(const char* path, std::uintmax_t* size) { -#if defined(_WIN64) || defined(_WIN32) +#if defined(_WIN32) WIN32_FILE_ATTRIBUTE_DATA attr; /*int path_utf16_size = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0); wchar_t *path_utf16 = new wchar_t[path_utf16_size]; @@ -95,7 +95,7 @@ inline bool WriteFile(const void* data, size_t size, FILE* f) inline bool ResizeFile(const char* path, std::uintmax_t size) { -#if defined(_WIN64) || defined(_WIN32) +#if defined(_WIN32) LARGE_INTEGER lisize; lisize.QuadPart = static_cast(size); if (lisize.QuadPart < 0) {