From 12d18ca64de7e2961721250bd7cd1efcca222377 Mon Sep 17 00:00:00 2001 From: expwnent Date: Thu, 19 Jun 2014 22:32:02 -0400 Subject: [PATCH] Fix compile issues on windows. --- library/modules/Filesystem.cpp | 2 +- plugins/tweak.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp index 9f0df3097..2c3cf5dfe 100644 --- a/library/modules/Filesystem.cpp +++ b/library/modules/Filesystem.cpp @@ -88,7 +88,7 @@ bool DFHack::Filesystem::rmdir (std::string path) } #ifdef _WIN32 -_filetype *mode2type (unsigned short mode) { +_filetype mode2type (unsigned short mode) { #else _filetype mode2type (mode_t mode) { #endif diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp index c8052a386..8154b473e 100644 --- a/plugins/tweak.cpp +++ b/plugins/tweak.cpp @@ -407,7 +407,7 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest x = 2, y = 4; int32_t points = this->points_remaining; OutputString(COLOR_WHITE, x, y, "Points left: "); - OutputString((points ? COLOR_YELLOW : COLOR_LIGHTGREEN), x, y, std::to_string(points)); + OutputString((points ? COLOR_YELLOW : COLOR_LIGHTGREEN), x, y, std::to_string((unsigned long long/*won't compile on windows otherwise*/)points)); x = dim.x - 10, y = dim.y - 1; OutputString(COLOR_WHITE, x, y, "DFHack"); }