From 105d63a69787ba04bcdd7a42c6aa94f01960fd43 Mon Sep 17 00:00:00 2001 From: Scott Giese Date: Sun, 20 Jan 2019 20:35:08 -0600 Subject: [PATCH] Simgear: LARGE_INTEGER is defined in Windows.h Fixes build issues on Linux. --- simgear/io/sg_file.hxx | 2 +- simgear/timing/timestamp.cxx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/simgear/io/sg_file.hxx b/simgear/io/sg_file.hxx index 267295b0..59de6ba7 100644 --- a/simgear/io/sg_file.hxx +++ b/simgear/io/sg_file.hxx @@ -88,7 +88,7 @@ public: /** @return true of eof conditions exists */ virtual bool eof() const { return eof_flag; }; - std::string SGFile::computeHash(); + std::string computeHash(); }; diff --git a/simgear/timing/timestamp.cxx b/simgear/timing/timestamp.cxx index b12f7544..067a1b95 100644 --- a/simgear/timing/timestamp.cxx +++ b/simgear/timing/timestamp.cxx @@ -71,9 +71,12 @@ static clockid_t getClockId() } #endif + +#ifdef _WIN32 static bool qpc_init = false; static LARGE_INTEGER s_frequency; static BOOL s_use_qpc; +#endif void SGTimeStamp::stamp() {